Revert DGW implementation - should have been pushed to a branch