Backed out changeset 3b0468c92157 (bug 891882) for breaking a test in gaia-ui-test