Revert "on the spot reset"

This reverts commit 5fed9e57939a480674a50354d4e5e45e0c15fddf.