Fix CSS perf (hopefully)

@Bug W-2048506@

@rev eric.anderson@
Merging origin/goliver/master-pending-css-perf into master