Revert "Added fix for Issue #137"

This reverts commit cedc8ef8fbd75983025408b33afd77a484394d8c.
Revert "Added tests for Issue #137"

This reverts commit ce0c5043291c8075deb4dc6819b919f64bb2b386.