Revert "Untested -- removed a ton of more deprecated code"

This reverts commit 8908fd1496779fbc6b745b3442dbb5972897a2c0.