This fix seems unrelated to the rest of the patch series.