Last merge reverted everything to 2-day-old stuff. This  fixes that.