Revert "bring back some old stuff from the dead"

This reverts commit ca6c626d3afea16d0a5d7e9926dccd4135216c11.