Don't double reset

This fixes #590.  It looks like the reset wasn't really needed.

@samphippen / @JonRowe -- you two were the ones that worked on #523.  Can you confirm this is OK and I'm not missing something?