Backout bug 1084412 for Gij bustage and causing Gaia tree closures
Merge m-c to inbound. a=merge
CLOSED TREE