Backout 0504d13d6a83 and f87809c07615. DONTBUILD