Reset on rebuild

This depends on other open pull requests, so do those first.