Add all module deps back, close #1560