Revert "proposed fix for issue #26" (because it's wrong)

This reverts commit 068d41f8f2731e53f6b0d5b1287fff640aec076a.