[COMPAT] Upgrade to latest bluebird version
[CLEANUP] Revert workaround in 6e6595f988ebe3421325ffad77a0d45884f03827

Doesn't seem to be necessary with latest version of bluebird