fix #25680 and #25421 by correcting timezone support (hopefully)