Merge "Revert "Breaking out disallowed CSS into a global variable""