Back out ac6dff6a0811 and f97bc1de213a (bug 700022) for permaorange in b2g R6