Revert "Revert "Reverting to clean reset""

This reverts commit 3fe368c08555bf859404e3823e938559bbf94c6e.