Resolve a bad merge.  Failed to include the timezone keyword argument.