This reverts commit 9cae8784c0. Because the reverted change broke compatibility with 4.2.x configuration.
9cae8784c0