Follow up to #6656
Follow up to #6656