Backing out bug 891258 due to broken styling issues on OSX. r=backout