Revert "-- GFX Updates"

This reverts commit f4e77fa3b33c0397967c5e255613bd4d52a91a24.