cf476897c0
This reverts commitdf0de2458f. Reason for revert: Bringing back original change Change-Id: I33bbc9b698e07ca8e03ee6b15bcb66f5795bbe4e [ROCm/hip commit:504e670d73]