Revert breaking changes

It looks like I accidentally applied not_samp_compatible patches before
uploading the code.