Revert "Age increment missing"

This reverts commit 29afdfa6105098d0b55fc0056b3060a90617ca56.
Revert "Revert "Age increment missing""

This reverts commit 57488497a1ed7f6b71c99f0eb6aa65a7ab44981b.
Revert "Revert "Revert "Age increment missing"""

This reverts commit f945138e786c193ffb244bae34544be8bdde6f0d.