reverts 86fb4b29cdf9979466f53ea61486ae31cc95f62b

Past me was an idiot and thought fixing typos in a long-standing branch
was a good idea.  *sigh*.