backout 8d185e7c78ee, DONTBUILD
backout 3fab6aadcd16, DONTBUILD
backout 3c1115f0a0a0, DONTBUILD