revert commit 1f9406d in order to only have deep clone in this pull request