Partially revert commit 127155: I think it is much more convenient