Backed out changesets 674c36d744fb (bug 1000114) and eddce10b8511 (bug 1004506) for frequent OSX 10.8 bc3 failures.