issue #22669: Try this again.