Add `rewrite` method
Revert "Add `rewrite` method"

This reverts commit 8141bd2ca4c69f2b8cf9fc8034776cd34b362114.
Version 2.23.0
Merge branch 'release/v2.23.0' into develop