diff --git a/Directory.Build.props b/Directory.Build.props
index 2f9863561c..de3583a0c8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,27 +31,27 @@
 
   <!--
     https://apisof.net/
-    +===================+=======+==========+=====================+=============+=================+====================+==============+============+
-    | SUPPORTS          | MATHF | HASHCODE | EXTENDED_INTRINSICS | SPAN_STREAM | ENCODING_STRING | RUNTIME_INTRINSICS | CODECOVERAGE | BASE64SPAN |
-    +===================+=======+==========+=====================+=============+=================+====================+==============+============+
-    | netcoreapp3.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |      Y       |      Y     |
-    | netcoreapp2.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        N           |      Y       |      Y     |     
-    | netcoreapp2.0     |   Y   |    N     |         N           |      N      |        N        |        N           |      Y       |      Y     |
-    | netstandard2.1    |   Y   |    Y     |         N           |      Y      |        Y        |        N           |      Y       |      N     |
-    | netstandard2.0    |   N   |    N     |         N           |      N      |        N        |        N           |      Y       |      N     |
-    | netstandard1.3    |   N   |    N     |         N           |      N      |        N        |        N           |      N       |      N     |
-    | net472            |   N   |    N     |         Y           |      N      |        N        |        N           |      Y       |      N     |
-    +===================+=======+==========+=====================+=============+=================+====================+==============+============+
+    +===================+=======+==========+=====================+=============+=================+====================+==============+
+    | SUPPORTS          | MATHF | HASHCODE | EXTENDED_INTRINSICS | SPAN_STREAM | ENCODING_STRING | RUNTIME_INTRINSICS | CODECOVERAGE |
+    +===================+=======+==========+=====================+=============+=================+====================+==============+
+    | netcoreapp3.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        Y           |      Y       |
+    | netcoreapp2.1     |   Y   |    Y     |         Y           |      Y      |        Y        |        N           |      Y       |    
+    | netcoreapp2.0     |   Y   |    N     |         N           |      N      |        N        |        N           |      Y       |
+    | netstandard2.1    |   Y   |    Y     |         N           |      Y      |        Y        |        N           |      Y       |
+    | netstandard2.0    |   N   |    N     |         N           |      N      |        N        |        N           |      Y       |
+    | netstandard1.3    |   N   |    N     |         N           |      N      |        N        |        N           |      N       |
+    | net472            |   N   |    N     |         Y           |      N      |        N        |        N           |      Y       |
+    +===================+=======+==========+=====================+=============+=================+====================+==============+
     -->
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_RUNTIME_INTRINSICS;SUPPORTS_CODECOVERAGE;SUPPORTS_BASE64SPAN</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_RUNTIME_INTRINSICS;SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE;SUPPORTS_BASE64SPAN</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_EXTENDED_INTRINSICS;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_CODECOVERAGE;SUPPORTS_BASE64SPAN</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_CODECOVERAGE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <DefineConstants>$(DefineConstants);SUPPORTS_MATHF;SUPPORTS_HASHCODE;SUPPORTS_SPAN_STREAM;SUPPORTS_ENCODING_STRING;SUPPORTS_CODECOVERAGE</DefineConstants>
diff --git a/src/ImageSharp/ImageExtensions.cs b/src/ImageSharp/ImageExtensions.cs
index 3cb4f433ec..d7ac0b174d 100644
--- a/src/ImageSharp/ImageExtensions.cs
+++ b/src/ImageSharp/ImageExtensions.cs
@@ -115,29 +115,12 @@ namespace SixLabors.ImageSharp
         public static string ToBase64String<TPixel>(this Image<TPixel> source, IImageFormat format)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            using (var stream = new MemoryStream())
-            {
-                source.Save(stream, format);
-
-                // Always available.
-                stream.TryGetBuffer(out ArraySegment<byte> buffer);
+            using var stream = new MemoryStream();
+            source.Save(stream, format);
 
-#if !SUPPORTS_BASE64SPAN
-
-                byte[] sharedBuffer = ArrayPool<byte>.Shared.Rent(buffer.Count);
-                try
-                {
-                    buffer.AsSpan().CopyTo(sharedBuffer);
-                    return $"data:{format.DefaultMimeType};base64,{Convert.ToBase64String(sharedBuffer)}";
-                }
-                finally
-                {
-                    ArrayPool<byte>.Shared.Return(sharedBuffer);
-                }
-#else
-                return $"data:{format.DefaultMimeType};base64,{Convert.ToBase64String(buffer)}";
-#endif
-            }
+            // Always available.
+            stream.TryGetBuffer(out ArraySegment<byte> buffer);
+            return $"data:{format.DefaultMimeType};base64,{Convert.ToBase64String(buffer.Array, 0, (int)stream.Length)}";
         }
     }
 }