e60714a451
This reverts commit336afbbb60. The regressions (SWDEV-459556 and SWDEV-460260) caused by the original patch has been resolved. Change-Id: Ic3a5712472f29d682d4853ad5a69d9c46df87299 [ROCm/hip commit:5590827760]