Revert "Issue #105"

This reverts commit 6aacce03295bc37aa95fc538a6ccf7660e30fecb.