Revert "Merge branch 'additional-features'"

This reverts commit 76d5206f63e704d6002e7bd2bcb62792b9a52850, reversing
changes made to bed0990f286149715c0bd0e9a7ac76caf261d63f.