Remove old WAR for nvcc 6.5