This reverts commit 9d78c8c77cb4f86f29a0ee6cd9d03cbf9f558cb9. This seems to be utterly broken and I'm tired.