Is this related to the other changes in this PR?