Doing this asynchronously was racy -- under extreme circumstances, a
client could be deleted before it was added.