Revert "Fix issue #29"

This reverts commit 72715b14a556e2ae72f2fadf9a4ecffd9a055695.