Faster history ageing: take 2

bench: 3107929