Backout c2f5b092af4a and 551a4a099ca7. DONTBUILD