de3570107e
And slight cleanup (cherry picked from commit aed53d3bdc85ce0e899fbb90b9f9cad0f1b86480)
And slight cleanup (cherry picked from commit aed53d3bdc85ce0e899fbb90b9f9cad0f1b86480)