Unreviewed, roll out r240220 due to date-format-xparb regression