Revert "Revert "Reset after this""

This reverts commit 05a9f4261e59c2378329b82251e8acbffbb475da.