This reverts commit 81a120a5c5.
Reason for revert: Bring back original change.
Change-Id: I15c5f288bc50107831a494a81d1f16df4c2ade27
[ROCm/hip-tests commit: cf3df12106]
This reverts commit de3d24df97.
Reason for revert: This causes build failure in hipBLASLt & hipSPARSELt
Change-Id: Ifb1ee519971c6183eb53634d6d8901a9e94cc9cc
[ROCm/hip-tests commit: fe5206e50a]