Seems to be required for downstream client cookbook