Revert "Removed out-of-place changes to month and year label options, ready for a new branch and PR."

This reverts commit f7571c21e6cbff6eb4da81c78499ca8e2fd89719.
Attempting to remove out-of-place changes to month and year label options...