Adapt to galaxy::common_start being removed