[1.9] Follow-up for 0ed497b