Backed out changeset 6e588c56764b (bug 909542) for Gaia unit test perma-fail.