Backout 53db13404c16. DONTBUILD