Revert "Merge branch 'divert-all' of github.com:bluhm/sys into divert-all"

This reverts commit 2f89466067355250a7160f2b38513b14d111ca4c, reversing
changes made to 78f095075c109df2623113e968548a853f03f6ed.