Revert "Issue #86"

This reverts commit 8eba9c22221b4454165ee769606b427819defcfe.