Backed out changeset af1dbe183e3d (bug 1067088) for bustage.