Merge "Revert^3 "Read files from versioned tzdata paths."" into main