Backed out changeset e9c807b1e3d4 (bug 985257) for bustage.