Honor reset_on_next_client_command
We used to rely on getting something from the server inbetween (which is not a valid assumption).