Backout fa2130fc4f08 (bug 863872) due to xpcshell orange. r=bustage-fix for CLOSED TREE.