Atoms don't have clients, Revert of previous commit