Revert "GPU fixes from faux123"

This reverts commit 27ab1df346148af6be7417252083ccef77836813.