Backed out changeset c6fe8e2c41db (bug 1041180)
Backed out changeset 4bb508b6f0c5 (bug 1041180) for XPCshell test failures