After release 2.1.1, client query rewrites are only required for inserting the probe for block data. Ideally we would remove the error-prone rewrite code in favor of independent queries to indexers for that block data. These queries can be far less frequent than client queries typically are for each subgraph chain.