Merge "Revert "Don't construct SpecialPages twice""