Revert "CUDA nightly fail: Dirty hack"