Revert "Yydfinal"

Reverts xavier88858/yyd4#3