Back out cd218e07ede2, e57ac5581703, f53ad2a10ff8, ec91252c57d2, 2eca17711eff, 1997e63a1124 for build errors