Changes forgotten in https://gerrit.wikimedia.org/r/#/c/49372/

Change-Id: I3ef0347e3b19aeb84ba9583a1f2d0aff703e8997
Merge "Changes forgotten in https://gerrit.wikimedia.org/r/#/c/49372/" into production