Backed out changeset 1168d6e45277 (bug 885158) for causing conflicts with changes that landed on inbound earlier