Backout 7b45e8d4e2c9 and 965723ad58ec. DONTBUILD