Upgrade to es6-promise 2.0