Backed out changesets 70428bb355a4 and a0ba2f134695 (bug 1109457) for EME failures and crashes on OSX 10.6.