Revert "decruft"

This reverts commit 12af3d911889a695b36bbf836054099c3d694e4c.