Backed out changeset 124128336484 (bug 834020) for bustage.