Backout 7342df10a60f due to OSX10.8 orange. Bug 904458.