BATCH-1950: Ensure bundlor is available and remove from sample