Revert "Fix build and hang that occurs on alternative GPU types and cuda versions."
This reverts commit fafc5459
It was pushed accidentally straight to O4-dev even though it's protected. I think since we're all maintainers it ignores the protected tag. I'll do a little investigating/make an issue to see if there's a way around that.