Backed out changeset 5d3fe12c63ed (bug 1081037) for Gu Test Failures