Revert "Merge branch 'sprites'"

This reverts commit 449186ca3402806fbc1c7bbf509c5821aceca948, reversing
changes made to 7c7e485820f581d394e353b518861afd2ca7adbf.