This reverts commit a206abcaa1. Change-Id: I589d495b448a5ecc7def9dbca3f70b033a962f45 [ROCm/clr commit: 1cea2c0412]
a206abcaa1
1cea2c0412