Maintain a bit more back-compat with MediaWiki core

Follows-up 2b486d4e49.

Change-Id: I344811411ab6ca960e7eb357728103954f094ca0
Merge "Maintain a bit more back-compat with MediaWiki core"