Temporarily reverted ewf commits, use dtewf branch for updates