Revert "Cleanup and deprecate"

This reverts commit 29973443acd6f470a537d3c7a7745b394f53b5f4.