Backed out changeset afdb479e6427 (bug 966895) for causing Bug 1034015