Switch async dep to async-waterfall