Backout 3dce6eb5b672. DONTBUILD