is this an experiment? if we want this new behaviour, please remove commented out code and update doc (string+comment)