Backed out changeset a0b6a681d394 (bug 925398) for breaking Gu tests
Backed out changeset 5cd46f9b875a (bug 949406) for getting in the way of me backing out bug 925398
Backed out changeset aa3cec88b990 (bug 925398) for breaking Gu tests
Backed out changeset 7d667fc1bc20 (gaia's changes for bug 925398) to hopefully fix a CLOSED TREE