Back out a57e56c3de6b and 500790cdb1f0 due to test failures.