Back out 4a9ca7d8c499 (bug 918135) for frequent OS X orange