That last commit wasn't what I had in mind.