Revert "Backport GPU improvements from N7100"

This reverts commit a46a65a0d63d9d2cbdd34a585672ac75027802c7.