Revert "Interactive tweaks"

This reverts commit ae4e967a407072eb1578153f3fc90a81b02aef27.