Revert r99307 and its friend r99309, improper use of !important per CR