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

This reverts commit 3429574f6cd022a3d980df9b183d9ded8e992317.