Backport of backfill throttling (fix for #2211).