Revert "Replace client pointers with references"

Reverts acreloaded/acr#9