PR19099 - revert r203483