Bug filed as http://phabricator.wikimedia.org/T106328
Patch being reviewed at http://gerrit.wikimedia.org/r/#/c/230385/
Merged. Close?