The changes in this file are the only ones that should be made; revert the others and update the PR description to reflect this particular change, and it can be merged.