Backport CSL style fix.