Revert "Possible fix for #168, @mkohlhase please check"

This reverts commit eebc176b798de1d676608588e2cd586b6c179326.