reverts r110488