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

This reverts commit 39e95ec8e11bf165aafba91855224abc1e08fe5c.

Reason for revert: Temporary revert to diagnose golem issues.

Change-Id: Id1dc7d6258e2805089679ea63b62abeee6644a7f
2 files changed