Revert "Revert "Revert "Revert, so it's broken again (for demonstration purposes)"""

This reverts commit 372dd8a7355c034cee3e1844f76f33aa5b659d1b.