This reverts commit 2b78a9c443. Change-Id: I07aac68c76b3bc42b595330fdbbb04646b35a814 [ROCm/clr commit: 76a4bd1d7f]
2b78a9c443
76a4bd1d7f