no more workaround for recent nightly splits.