Fixes SWDEV-222155 & SWDEV-222158 This reverts commit e0b4ba96e8. [ROCm/clr commit: 18a64fe8d4]
e0b4ba96e8
18a64fe8d4