Backed out changeset c24d5055dc01 (bug 991767) for bustage.