Un-f***ing the merge from SDL2