Stage an incomplete rewrite to make RPC calls more robust.