Do these changes need to be in this PR?