This reverts commit 39e95ec8. Reason for revert: Temporary revert to diagnose golem issues. Change-Id: Id1dc7d6258e2805089679ea63b62abeee6644a7f