Backed out changeset ce8f00cca9dd (bug 1000338) for XPC-2 test failures