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