Revert "Merge branch 'master' of github.com:hahoyer/reni.cpp"

This reverts commit e2acbbb853b12fe58b838c71f6b5472f24392e2a, reversing
changes made to 9a4a2c2614f0265a236a648e9ef6a0328688a95c.