Backing out b94c916122c8 (bug 1021612) for sudden windows xpcshell failures, r=backout