Cherry pick of merge request !374 (merged)
Should fix the failing Boole build today.
/cc @clemenci @cattanem @graven