Revert "Testing New Graphics"

This reverts commit eabafe58cd5b9a0c67c96d1bb069e7972a92cd5e.