Revert buggy MediaWiki UI change and dependent changes