Revert "kill off some cruft"

This reverts commit aedb193e91ddb32bd34dca52317c0a0ac241a3e3.