gpu fix but needs revert
Revert "gpu fix but needs revert"

This reverts commit 32ca19444b9d58c9eb83f67e268120befad9ff14.