Backout bba5653b54d0 and cecc1e2aad91. DONTBUILD