temporarily revert TO 886f1fa

(Willy's last commit)