Removed unused code that breaks certain use cases (Fixes #234).
Merge pull request #236 from dchandekstark/issue-234

Removed unused code that breaks certain use cases