block: fix up cherry-pick