Reverting 0b9bf6bbc4c4ef5d3d90280bf45bfad245bdf661 Fixes Issue #182