Merge "Remove a hack, and a hack for the hack, for MediaWiki UI input fields"