Revert "Merge branch 'Ui-and-Sprites'"

This reverts commit b0146b839a9fff0615b37cc8be8e92e795691237, reversing
changes made to 02525bf5bc3e2e0535b14780cb8355293f4f9ff4.