Follow-up to #15215 [ci skip]