CNS-806: Conflicting stylesheets with baseline.css