Fixes a bug where blocking queries that are retried don't have their blocking timeout reset, resulting in them running longer than expected.