These changes look like they belong in a different pull request...