Removed PR 65185 changes since incomplete solution