Revert "Fix Issue #118"

This reverts commit 98fd889619a651c0266f251c7b40fc189ca30759.