Backed out changesets d83f69660b5a and b54f084f8e39 (bug 684722) for frequent OSX timeouts.