Backed out changeset 929cc6239d79 (bug 1022434) for bustage