Does this code really have to be in this PR ? I don't see the relation.