WIP-Revert rpc allocator change