Backed out changeset 87433694df01 (bug 1082734) for Gaia unit test failures.
CLOSED TREE