This reverts commit 9263f193d0. Reason for revert: better fix in ROCclr Change-Id: I9707e69adf42a662c08fe9b3ec7458655d838bdd [ROCm/hip commit: 7e57136aba]
9263f193d0
7e57136aba