Revert "Reverting to clean reset"

This reverts commit 8cb4f83ef65151de730aa7f77634b7afedd7c812.