Backed out changeset eba1f5d0a908 (bug 864395) for Gaia integration test failures.
CLOSED TREE