Merge pull request #17033 from seamuslee001/5.25
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 8 Apr 2020 22:12:09 +0000 (10:12 +1200)
committerGitHub <noreply@github.com>
Wed, 8 Apr 2020 22:12:09 +0000 (10:12 +1200)
Revert "temp workaround for dev/core#1675"


Trivial merge