2 files changed, 3 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 723556414f4..11432b45f92 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -268,6 +268,8 @@
         (Fuser_login_name, Fuser_full_name): Signal an error
         if a uid argument is out of range, rather than relying on
         undefined behavior.
+        (Fformat_time_string): Remove now-unnecessary check.
+        lisp_time_argument checks for out-of-range usec now.
         * emacs.c (gdb_valbits, gdb_gctypebits): Now int, not EMACS_INT.
         (gdb_data_seg_bits): Now uintptr_t, not EMACS_INT.
         (PVEC_FLAG, gdb_array_mark_flag): Now ptrdiff_t, not EMACS_INT.
diff --git a/src/editfns.c b/src/editfns.c
index 48b601860ca..b376c3a7c51 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1696,8 +1696,7 @@ usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL)  */)
 
   CHECK_STRING (format_string);
 
-  if (! (lisp_time_argument (timeval, &value, &usec)
-         && 0 <= usec && usec < 1000000))
+  if (! lisp_time_argument (timeval, &value, &usec))
     error ("Invalid time specification");
   ns = usec * 1000;