This reverts commit b4d8586a11. Reason for revert: Doesn't match with CUDA behavior Change-Id: I413f3d241f864c1e7c21681c5fff8f216ef54306
b4d8586a11