Revert "Def2"

This reverts commit 78398a9a1ad700082b69481edd6e946544e52cf1.