Backout 7cdd7f6f2659 and c4309457d036. DONTBUILD