Were these changes intended in this PR? You might want to update the PR description if so..