Revert "Merge branch 'feature-idea'"

This reverts commit 61f08e32f043ba9fee9e292030347a9dd012aa07, reversing
changes made to 06206db83da0b5796fc86871eb27ed660890afc6.