Fix for issue #200
Revert "Fix for issue #200"

This reverts commit 8c139dc79af84a81f619f010be0b241eb5d4203c.
Fix for issue #200.