It seems that this patch also fixes #10755. (hurray!)