Revert "2.3 compatch"

Reverts Aasmul/SWMH#60