Revert "DWEC_1-7"

This reverts commit fcf153c15238a71088c0e2fc90f51f105605617d.