Apply the change suggested by PJE for issue 7250.  Unfortunately, we couldn't
come up with a unit test. :(
2 files changed