diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index d189af32efcbe..4f5ba2a19f342 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -14,7 +14,6 @@ import {
 	MediaPlaceholder,
 	useBlockProps,
 	store as blockEditorStore,
-	__experimentalUseBorderProps as useBorderProps,
 	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { useEffect, useRef, useState } from '@wordpress/element';
@@ -314,16 +313,10 @@ export function ImageEdit( {
 		/>
 	);
 
-	const borderProps = useBorderProps( attributes );
-
 	const classes = classnames( className, {
 		'is-transient': temporaryURL,
 		'is-resized': !! width || !! height,
 		[ `size-${ sizeSlug }` ]: sizeSlug,
-		'has-custom-border':
-			!! borderProps.className ||
-			( borderProps.style &&
-				Object.keys( borderProps.style ).length > 0 ),
 	} );
 
 	const blockProps = useBlockProps( {
@@ -335,10 +328,7 @@ export function ImageEdit( {
 	const placeholder = ( content ) => {
 		return (
 			<Placeholder
-				className={ classnames( 'block-editor-media-placeholder', {
-					[ borderProps.className ]:
-						!! borderProps.className && ! isSelected,
-				} ) }
+				className="block-editor-media-placeholder"
 				withIllustration={ true }
 				icon={ icon }
 				label={ __( 'Image' ) }
@@ -353,7 +343,6 @@ export function ImageEdit( {
 					width: height && aspectRatio ? '100%' : width,
 					height: width && aspectRatio ? '100%' : height,
 					objectFit: scale,
-					...borderProps.style,
 				} }
 			>
 				{ content }
diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index e76a99e424a51..220ad51d4fd37 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -25,7 +25,6 @@ import {
 	store as blockEditorStore,
 	useSettings,
 	__experimentalImageEditor as ImageEditor,
-	__experimentalUseBorderProps as useBorderProps,
 	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { useEffect, useMemo, useState, useRef } from '@wordpress/element';
@@ -567,9 +566,6 @@ export default function Image( {
 		defaultedAlt = __( 'This image has an empty alt attribute' );
 	}
 
-	const borderProps = useBorderProps( attributes );
-	const isRounded = attributes.className?.includes( 'is-style-rounded' );
-
 	let img = (
 		// Disable reason: Image itself is not meant to be interactive, but
 		// should direct focus to block.
@@ -586,14 +582,12 @@ export default function Image( {
 					} );
 				} }
 				ref={ imageRef }
-				className={ borderProps.className }
 				style={ {
 					width:
 						( width && height ) || aspectRatio ? '100%' : undefined,
 					height:
 						( width && height ) || aspectRatio ? '100%' : undefined,
 					objectFit: scale,
-					...borderProps.style,
 				} }
 			/>
 			{ temporaryURL && <Spinner /> }
@@ -622,7 +616,6 @@ export default function Image( {
 					onFinishEditing={ () => {
 						setIsEditingImage( false );
 					} }
-					borderProps={ isRounded ? undefined : borderProps }
 				/>
 			</ImageWrapper>
 		);