Back out c39d60483813 (bug 905364) for xpcshell and b2g desktop bustage