In fact this wasn't a good idea ...
(revert 43f53e0a40db8d082faa5b15709981b273100f93)