Revert "Revert "Revert "adf"""

This reverts commit 597998a41b8e8709a0c2ec28b74be225908f138d.