Merge "Remove HTML back-compat styles from I5fe0543e"