Backout 5b73ccbbccbe. DONTBUILD