Followup to primary PR for the issue, GH-6344.
(cherry picked from commit 55966f3a)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>