Merge #10618: Remove confusing MAX_BLOCK_BASE_SIZE.