Backout c8372f11ba0e. DONTBUILD