Revert "merge", dem tarnations is worse than moonshine

This reverts commit e79e906226303d45a455f65a776d7a2aea7472c7, reversing
changes made to 940b1b887686fdcf9e314b0d8bee93175be59697.