This reverts commit 51adec2730. Reason for revert: HIP tests on windows fails Change-Id: I795ed19d76a41e2fd9971414cefa5bd3be45d4bc
51adec2730