Put back the changes I removed in my last commit.
You would think I would know how to read diff output by now...