Yet another emergency hack, awaiting date-math fix.