Update to bluebird 2-ish