This change seems unrelated (and wrong).