Same as I commented in #10769