Revert "Issue #13 fix"

This reverts commit bb4b3735fa2ce461760f0afa4f1dd6c6b8f1ef47.
Revert bb4b373..19fdcd4

This rolls back to commit bb4b3735fa2ce461760f0afa4f1dd6c6b8f1ef47.