Revert "more rework, but broken build"

This reverts commit f88c37ff63755318aa579816f0b27d517ff15692.