This reverts commit 20add33513. Change-Id: Ia7b9ca115be4f9591b195194eed967fc6c330012 [ROCm/clr commit: 8c89d16572]
20add33513
8c89d16572