Revert r29594.  That was just plain wrong.  Sorry about workday configure change.
Fix CUDA-aware compile issues.