Merge "36019: Revert b/25095 breaks Special:Categories"