Backed out changeset f94ee00aa4d6 (bug 974197) for causing gaia-ui-test failures
Merge backout; CLOSED TREE