revert back due to dwc bug