Revert "Thanks: https://gerrit.wikimedia.org/r/#/c/156898/"

This reverts commit 4f172bb29487ceb79f7b11f3fecf17adbc0c9385.

Change-Id: Ie6510e163544366d7503c65a0ce531b93de4d276