This reverts all the merges done by the engine auto roller 6142e332 ab2bf187 ac9dcb5e cf0b385a 9c93b0c3 38e1dd10
