Reverse feature/#5: "Fix age calculation issue (even though it was by design)", not yet tested for release