match lowering: Remove the make_target_blocks
hack
#119112
Merged
make_target_blocks
hack
#119112