In support of https://github.com/etcd-io/etcd/issues/15953
In support of etcd-io/etcd#15953