Reverting previous change, we will figure this out next week.

This reverts https://gerrit.wikimedia.org/r/#/c/123895/

Change-Id: I17bec11875b172473080f347c2f36f73cdb26b20