Fix local to utc/zone switching with keepLocalTime option

This is a fix for #1719