Revert "DF-NONE - Merge changes."

This reverts commit c7dc927264cb7c38bd5c09074ebd410b11197820.