revert some changes from dhewg