fix #41991: revert 21aebdc8ce