This reverts commit b936e52874. This commit introduces a feature and should haven't been merged into the stable branch.
b936e52874