Revert of patch for an Issue #347