Add timezone support without putz dependency.
Resolve merge conflict.