Regresses golem benchmarks. This reverts commit 67ca49cf. Change-Id: I380173831ca2e5c095fa1fdb2b6df7467108c5df