Revert "More SDL2 fixes"

This reverts commit 774a767eff02b5ca81b3e154aa3f4e75730e716a.