Temporarily revert commit 04abbb3a due to regressions in some HIP apps due backend issues revealed by this change. Will re-commit it when backend issues are fixed.