Backed out changeset f6478f166f2f (bug 967524) for bustage.