Back out r208257 while I investigate tester failures.