Revert sloppy merge

I mixed my clothing PR in with Kevin's linux-helper PR.  That wasn't intentional, and exemplifies everything we *don't* want to see happening in our code-handling.

This reverts my PR's inclusion.  My apologies, all.