Backed out changeset 7052edb3da7f (bug 991533) for bustage.