Bring in change 8f57f438 from bluebird-chef (dufau)