Backed out changeset 68ba8f6f4f03 (bug 983445) for suspicion of causing xpcshell timeouts in test_browserid_identity.js.