No longer setting expiry_year to expiry_month (facepalm).