Follow up to #17646.