Backout b9fddc67dcb8. DONTBUILD