Revert "Possible work around for  Issue #28"

This reverts commit 8257466bbb04c7e69ed0e3bf30e290cb69129a83.