Another backported fix