Fixes SWDEV-222155 & SWDEV-222158 This reverts commit c7562072a3. [ROCm/hip commit: ab7526f64c]
c7562072a3
ab7526f64c