Backed out changeset 9b2588d41e3a (bug 969395) for bustage