Backed out changeset f434624463d9 (bug 965837) for bustage.