Revert "Bubbles and other stuff?"

This reverts commit 097f6c12f969c7491fae44be2a3fa193f942aa1f.