Backout 378083ea0d19. DONTBUILD