Backed out changeset 049306beb6bc to see if it fixes the xpcshell orange. a=backout
CLOSED TREE