This reverts commit c3f9cd6b. Reason for revert: golem breakage is unrelated. Change-Id: I5fcf9013379cf00d0d85436c0225cf6cfd412f84