Backed out changesets aed22a2d8353 and c61fe8e1f887 (bug 908006) for OSX reftest failures.