Removing unwanted commits from pull request

Oops, didn't realize these changes wre on the branch from an
old pull request.