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

This reverts commit 368192e6cc9727abb4f5ccf1a597a1e952531937.