Revert "Fix for Issue #50"

This reverts commit eaa386855659466bf37722b10b9e26f787d26c16.