Revert last commit -- didn't mean to push that to nvlabs/cub