revert some changes to make it better compatible

with more oxmin mods as they do different checks