Back out part of bug 1084001 because the tests are being silly.
Bug 1083648 followup to fix orange on CLOSED TREE due to random XBL stuff getting defined as props on the global.  r=bholley pending