This reverts commit f5cd7ec9. Certain rocPRIM/rocThrust/hipCUB tests were failing because of this change.