This reverts commit 3c92f2b64a which needs more thoughts and so will go into the next release.
3c92f2b64a