Merge "Revert "Stop-gap for buildbot and golem testing.""