Revert "Merge pull request #135 from CERIT-SC/master"

This reverts commit e17208a86c7483ec93e3347ab61d88728edb4761, reversing
changes made to 0665a5d77a4f26d23417dce221a15b8d112cd7b0.
Merge pull request #137 from hunner/revert_135

Revert "Merge pull request #135 from CERIT-SC/master"