Recommit r53710 without the hack for preventing style sheets being added multiple...