Merge "Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict resolution...