Backed out changeset 268ad6c0803b (bug 401014) for bustage.