Backout bug 1084412 for Gij bustage and causing Gaia tree closures