Temporarily avoid client key mgmt until we use storeconfigs