I attempted a fix on an extension, but my fix did not seem to work. Any suggestions? Details: https://phabricator.wikimedia.org/T190343
