Revert "Backport changes to gpu.cpp - note - currently broken in some ways" - performance is unacceptably bad with these changes

This reverts commit 5f4a5048ae8ac33d98d88973e161e07dd7c5948a.