Revert "apply patch for 0.9.1-hcv-open-source"

This reverts commit ced32b55ec516909e99b6eec75be05b1e658360c.