Backed out changeset 88fdc4a97ae7 (bug 939700) for OSX mozmill failures.