This reverts commit 9211e67d. Summary: This seemed to crash one one of the CUDA math tests. Revert until it can be fixed.