Backport Format fix from experimentally-experimental