Does this change need to be part of this PR?