Splitting from bug 35981 comment 15 and bug 35981 comment 16.
Fixed in https://gerrit.wikimedia.org/r/#/c/44273/
Needs review and merging.
Awesome, I didnt expect such fast progress!
Writing code is easy, getting it reviewed isn't :P
https://gerrit.wikimedia.org/r/44273 (Gerrit Change Id6b68c60180fded1c5e0af215f092545050007e4) | change ABANDONED [by Kaldari]
Looks like this was done in Gerrit change 41043.