dea38912fc
And slight cleanup (cherry picked from commit 8f9a325895bb7b94c2ec92dd969094fc30b3b5e2)
And slight cleanup (cherry picked from commit 8f9a325895bb7b94c2ec92dd969094fc30b3b5e2)