Revert "Revert "rewind""

This reverts commit 5d7dfb996bcf2cce95d2ca6190f037d3ef3ece72.