Revert the removal of some features...for now

This reverts commit f61c05ac34f3ebf0067de022a30c88564846b4dc.