This reverts commit eff4583118. Reason for revert: Catch2 test fails Change-Id: If0ea0eab16b50f27c9acbc471530266917773ff1 [ROCm/clr commit: d888c0a9bf]
eff4583118
d888c0a9bf