Revert "Fix issue #101"

This reverts commit 4cb9c0a275277de65d74c6b9d8a83f93035cb925.

Revert.