57cb840058
This reverts commit 3b9963c499.
Reason for revert: <Need rocprofiler changes to avoid PSDB failures>
Change-Id: I856b7ea30744f1b7bb099b6adbce2155201be539