Reverting to unbreak golem builds. This reverts commit 3c92b129. Change-Id: I78ef481f57fbcd3b3a9f4802dd6c21dabb186856