Follow up to #14311
Follow up to #14311