This reverts commits
   6ad8c96f,
   a3f97d1d,
   25abe582

I should know better by now than to push without checking for outstanding
changes.