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

This reverts commit 4b40579b1c579e20e37c549679c96a7c7dafed7d.