diff --git a/src/components/datagrid/_data_grid_data_row.scss b/src/components/datagrid/_data_grid_data_row.scss
index 543c50c51308..e5465786003d 100644
--- a/src/components/datagrid/_data_grid_data_row.scss
+++ b/src/components/datagrid/_data_grid_data_row.scss
@@ -125,14 +125,6 @@
   align-items: center;
 }
 
-.euiDataGridRowCell__numericalHeight {
-  // Without this rule, popover anchors content that overflows off the page
-  [data-euiportal],
-  .euiPopover {
-    height: 100%;
-  }
-}
-
 // Positioning for cell actions & the cell expansion popover
 .euiDataGridRowCell__actions,
 .euiDataGridRowCell__actions + [data-euiportal] > .euiPopover {
diff --git a/src/components/datagrid/body/data_grid_cell.tsx b/src/components/datagrid/body/data_grid_cell.tsx
index 2a9df001b393..9dada1984663 100644
--- a/src/components/datagrid/body/data_grid_cell.tsx
+++ b/src/components/datagrid/body/data_grid_cell.tsx
@@ -54,7 +54,6 @@ const EuiDataGridCellContent: FunctionComponent<
     isFocused: boolean;
     ariaRowIndex: number;
     rowHeight?: EuiDataGridRowHeightOption;
-    cellHeightType: string;
     cellActions?: ReactNode;
   }
 > = memo(
@@ -69,7 +68,6 @@ const EuiDataGridCellContent: FunctionComponent<
     rowHeightUtils,
     isControlColumn,
     isFocused,
-    cellHeightType,
     cellActions,
     ...rest
   }) => {
@@ -77,6 +75,9 @@ const EuiDataGridCellContent: FunctionComponent<
     const CellElement =
       renderCellValue as JSXElementConstructor<EuiDataGridCellValueElementProps>;
 
+    const cellHeightType =
+      rowHeightUtils?.getHeightType(rowHeight) || 'default';
+
     const classes = classNames(
       'euiDataGridRowCell__content',
       !isControlColumn && {
@@ -710,15 +711,12 @@ export class EuiDataGridCell extends Component<
       rowIndex,
       rowHeightsOptions
     );
-    const cellHeightType =
-      rowHeightUtils?.getHeightType(rowHeight) || 'default';
 
     const cellContentProps = {
       ...rest,
       setCellProps: this.setCellProps,
       column,
       columnType,
-      cellHeightType,
       isExpandable,
       isExpanded: popoverIsOpen,
       isDetails: false,
@@ -738,7 +736,6 @@ export class EuiDataGridCell extends Component<
           rowIndex={rowIndex}
           colIndex={colIndex}
           column={column}
-          cellHeightType={cellHeightType}
           onExpandClick={() => {
             if (popoverIsOpen) {
               closeCellPopover();
diff --git a/src/components/datagrid/body/data_grid_cell_actions.tsx b/src/components/datagrid/body/data_grid_cell_actions.tsx
index e95332e2a8fc..451ebe87c14d 100644
--- a/src/components/datagrid/body/data_grid_cell_actions.tsx
+++ b/src/components/datagrid/body/data_grid_cell_actions.tsx
@@ -18,20 +18,17 @@ import { EuiButtonIcon, EuiButtonIconProps } from '../../button/button_icon';
 import { EuiButtonEmpty, EuiButtonEmptyProps } from '../../button/button_empty';
 import { EuiFlexGroup, EuiFlexItem } from '../../flex';
 import { EuiPopoverFooter } from '../../popover';
-import classNames from 'classnames';
 
 export const EuiDataGridCellActions = ({
   onExpandClick,
   column,
   rowIndex,
   colIndex,
-  cellHeightType,
 }: {
   onExpandClick: () => void;
   column?: EuiDataGridColumn;
   rowIndex: number;
   colIndex: number;
-  cellHeightType: string;
 }) => {
   // Note: The cell expand button/expansion popover is *always* rendered if
   // column.cellActions is present (regardless of column.isExpandable).
@@ -96,11 +93,11 @@ export const EuiDataGridCellActions = ({
     );
   }, [column, colIndex, rowIndex]);
 
-  const classes = classNames('euiDataGridRowCell__actions', {
-    'euiDataGridRowCell__actions--overlay': cellHeightType !== 'default',
-  });
-
-  return <div className={classes}>{[...additionalButtons, expandButton]}</div>;
+  return (
+    <div className="euiDataGridRowCell__actions">
+      {[...additionalButtons, expandButton]}
+    </div>
+  );
 };
 
 export const EuiDataGridCellPopoverActions = ({