Backout 8a3dd329ab86 and a029774fbb7c. DONTBUILD