Backed out changeset c81707878977 (bug 974197) for Gaia integration test failures on a CLOSED TREE.