Need to consider adding a man page to suppress the final warning, but that may not be worth the overhead.
Reverts ecb43235