Backed out changeset 7f26289a3718 (bug 991533) for bustage.