Revert "Fix derp from previous ion commits"

This reverts commit 34a0695cbe98751845ffe6b3223c7dda71a104d6.
Revert "gpu: ion: several bugfixes and enhancements of ION"

This reverts commit 088fd5b8e0ac2ef4ca569c7d03759041d203a8f9.