Revert 1ad32c35b548. Bug 1023881 - Revert hsb change. r=backout,a=backout