Revert "Prepare for new feature"

This reverts commit 9e01e1063691cabecad95d507a16703cd236b50c.