Revert the removal of some features...for now

This reverts commit f61c05ac34f3ebf0067de022a30c88564846b4dc.
Revert "Revert the removal of some features...for now"

This reverts commit 0924dd5cc88cf33b9a459f1f0e8b57601698d367.