Revert "2.3 compatch"
Merge pull request #61 from Aasmul/revert-60-2.3-compatch

Revert "2.3 compatch"