Reverted previous solution of Issue #3131303.

   *   The entity to calculate a bulk form key for.

   * @param mixed $base_field_value

   *   The value of the base field for this view result.

   * @param mixed $row_index

   *   Index of view result.

   *

   * @return string

   *   The bulk form key representing the entity id, language and revision (if

   *

   * @see self::loadEntityFromBulkFormKey()

   */

  public static function calculateEntityBulkFormKey(EntityInterface $entity, $base_field_value, $row_index): string {

  public static function calculateEntityBulkFormKey(EntityInterface $entity, $base_field_value): string {

    // We don't really need the entity ID or type ID, since only the

    // base field value and language are used to select rows, but

    // other modules may need those values.

      $entity->language()->getId(),

      $entity->getEntityTypeId(),

      $entity->id(),

      $row_index,

    ];

    // An entity ID could be an arbitrary string (although they are typically

        if ($entity = $this->getEntity($row)) {

          $bulk_form_keys[$row_index] = self::calculateEntityBulkFormKey(

            $entity,

            $row->{$base_field},

            $row_index

            $row->{$base_field}

          );

          $entity_labels[$row_index] = $entity->label();

        }