This reverts commit 8392200773. Change-Id: Ib9cb1cc0c3903bfba56c9a5d05ae8afe96be583a [ROCm/clr commit: 51926b6b6b]
8392200773
51926b6b6b