Backed out changeset a24917a68821 (bug 980549) for Gaia unit test and Gaia UI test failures. a=backout