Revert "Merge pull request #519 from tlex/dev"

This reverts commit 32191ef9d8164b98bb668f0175ba8d117a0a2e76, reversing
changes made to 8b77dddaaf753dd23b0b30df5d5dff0437908979.