Revert "Merge branch 'botbot-2.0' into 2.0-clean"

This reverts commit 58b69ae0c7203967436c1242e72048f98c9a8034, reversing
changes made to ccfc24fbf5a3b456471f411847d108b05a4ca692.