Revert "merged branch Tobion/patch-2 (PR #497)"

This reverts commit 507a3f9ab0abb106c22bb4d00a25a896a06a22ba, reversing
changes made to de036c89aede01fd2ec31faff760cee9b2a4be39.