b7101af203
This reverts commit 961717879d.
Reason for revert: This patch breaks ROCPrim tests
Change-Id: Ib2235f719861c9f4317c33e86b6c1f8bc669cfd4