_s: Revert reset changes. They were accidentally committed after
resolving merge conflicts.