This change seems unrelated to this PR.  Can you rebase to see if it goes away?