This reverts commit ec1631a06f. It was merged too fast, without giving a chance to maintainers to suggest the changes in the upcoming commits.
ec1631a06f