This reverts commit 92bf87d8. We keep this in the testing version, but once we want to start stabilizing, we drop it.