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

Change-Id: I1d92ca9fc0ccaec77033ef3036fdff2af1ce1bbd