Looks like this is only called in one place. Do we really need the block?