Revert "Hack around failing jenkins tests"

Jenkins was repaired in I6cc27f4bafc395533fd395cadf3cc25b9f627b42

This reverts commit 3d792502080b7eab691f5c757cdc6239fb720665.

Change-Id: I8fa213d625e6c3c7900548ebeb0b224fbea971fc
Merge "Revert "Hack around failing jenkins tests"" into frontend-rewrite