Revert "Issue #118 again"

This reverts commit 73881117d9998e17b69ad662094df4f3de1405b2.