This reverts commit 37f5f5d5. The features itroduced by this commit are postponed until they are ready to be used in production