revert 20476