Revert "Issue #83"

This reverts commit b7a724937d79f534f13c216e0f7d34359cd43818.