Is this change intentionally part of this PR?