Revert "Merge pull request #1 from JulHeg/master"

This reverts commit e9a1066782983446a8f89d6f5ff5748ff16fa91b, reversing
changes made to 3ae6b1d360743a89254b40b1214fe1f11255caee.