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

Change-Id: Ideec43b3c9276c0391d6a221796e0748af48cf04