This reverts commit 7ceb5f09df. Somehow 7ceb5f09 introduced from the master branch into the 4.1 branch.
7ceb5f09df
7ceb5f09