diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj
index 10e34886c4..e5e927c11f 100644
--- a/src/chocolatey.tests/chocolatey.tests.csproj
+++ b/src/chocolatey.tests/chocolatey.tests.csproj
@@ -121,7 +121,6 @@
     <Compile Include="infrastructure\commands\CommandExecutorSpecs.cs" />
     <Compile Include="infrastructure\commands\PowershellExecutorSpecs.cs" />
     <Compile Include="infrastructure\configuration\ConfigSpecs.cs" />
-    <Compile Include="infrastructure\cryptography\CryptoHashProviderSpecs.cs" />
     <Compile Include="infrastructure\events\context\FakeEvent.cs" />
     <Compile Include="infrastructure\events\context\FakeSubscriber.cs" />
     <Compile Include="infrastructure\events\EventSubscriptionManagerSpecs.cs" />
diff --git a/src/chocolatey.tests/infrastructure/cryptography/CryptoHashProviderSpecs.cs b/src/chocolatey.tests/infrastructure/cryptography/CryptoHashProviderSpecs.cs
deleted file mode 100644
index 003248166c..0000000000
--- a/src/chocolatey.tests/infrastructure/cryptography/CryptoHashProviderSpecs.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright © 2017 - 2021 Chocolatey Software, Inc
-// Copyright © 2011 - 2017 RealDimensions Software, LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-//
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace chocolatey.tests.infrastructure.cryptography
-{
-    using System;
-    using System.IO;
-    using System.Security.Cryptography;
-    using chocolatey.infrastructure.adapters;
-    using chocolatey.infrastructure.app;
-    using chocolatey.infrastructure.cryptography;
-    using chocolatey.infrastructure.filesystem;
-    using Moq;
-    using Should;
-
-    public class CryptoHashProviderSpecs
-    {
-        public abstract class CryptoHashProviderSpecsBase : TinySpec
-        {
-            protected CryptoHashProvider Provider;
-            protected Mock<IFileSystem> FileSystem = new Mock<IFileSystem>();
-
-            public override void Context()
-            {
-                Provider = Provider = new CryptoHashProvider(FileSystem.Object);
-            }
-        }
-
-        public class when_HashProvider_provides_a_hash : CryptoHashProviderSpecsBase
-        {
-            private string result;
-            private readonly string filePath = "c:\\path\\does\\not\\matter.txt";
-            private readonly byte[] byteArray = new byte[] { 23, 25, 27 };
-
-            public override void Context()
-            {
-                base.Context();
-                FileSystem.Setup(x => x.file_exists(It.IsAny<string>())).Returns(true);
-                FileSystem.Setup(x => x.read_file_bytes(filePath)).Returns(byteArray);
-            }
-
-            public override void Because()
-            {
-                result = Provider.hash_file(filePath);
-            }
-
-            [Fact]
-            public void should_provide_the_correct_hash_based_on_a_checksum()
-            {
-                var expected = BitConverter.ToString(SHA256.Create().ComputeHash(byteArray)).Replace("-", string.Empty);
-
-                result.ShouldEqual(expected);
-            }
-        }
-
-        public class when_HashProvider_attempts_to_provide_a_hash_for_a_file_over_2GB : CryptoHashProviderSpecsBase
-        {
-            private string result;
-            private readonly string filePath = "c:\\path\\does\\not\\matter.txt";
-            private readonly byte[] byteArray = new byte[] { 23, 25, 27 };
-            private readonly Mock<IHashAlgorithm> _hashAlgorithm = new Mock<IHashAlgorithm>();
-
-            public override void Context()
-            {
-                base.Context();
-                Provider = new CryptoHashProvider(FileSystem.Object, _hashAlgorithm.Object);
-
-                FileSystem.Setup(x => x.file_exists(It.IsAny<string>())).Returns(true);
-                FileSystem.Setup(x => x.read_file_bytes(filePath)).Returns(byteArray);
-                _hashAlgorithm.Setup(x => x.ComputeHash(byteArray)).Throws<IOException>(); //IO.IO_FileTooLong2GB (over Int32.MaxValue)
-            }
-
-            public override void Because()
-            {
-                result = Provider.hash_file(filePath);
-            }
-
-            [Fact]
-            public void should_log_a_warning()
-            {
-                MockLogger.MessagesFor(LogLevel.Warn).Count.ShouldEqual(1);
-            }
-
-            [Fact]
-            public void should_not_throw_an_error_itself()
-            {
-                //this handles itself
-            }
-
-            [Fact]
-            public void should_provide_an_unchanging_hash_for_a_file_too_big_to_hash()
-            {
-                result.ShouldEqual(ApplicationParameters.HashProviderFileTooBig);
-            }
-        }
-    }
-}
diff --git a/src/chocolatey/infrastructure.app/ApplicationParameters.cs b/src/chocolatey/infrastructure.app/ApplicationParameters.cs
index 982fb6d1bd..a58558292a 100644
--- a/src/chocolatey/infrastructure.app/ApplicationParameters.cs
+++ b/src/chocolatey/infrastructure.app/ApplicationParameters.cs
@@ -136,7 +136,6 @@ public static class Environment
         public static readonly string ConfigFileTransformExtension = ".install.xdt";
         public static readonly string[] ShimDirectorFileExtensions = new string[] {".gui",".ignore"};
 
-        public static readonly string HashProviderFileTooBig = "UnableToDetectChanges_FileTooBig";
         public static readonly string HashProviderFileLocked = "UnableToDetectChanges_FileLocked";
 
         /// <summary>
diff --git a/src/chocolatey/infrastructure/cryptography/CryptoHashProvider.cs b/src/chocolatey/infrastructure/cryptography/CryptoHashProvider.cs
index 81ac8f04df..7a17dce451 100644
--- a/src/chocolatey/infrastructure/cryptography/CryptoHashProvider.cs
+++ b/src/chocolatey/infrastructure/cryptography/CryptoHashProvider.cs
@@ -90,21 +90,23 @@ public string hash_file(string filePath)
 
             try
             {
-                var hash = _hashAlgorithm.ComputeHash(_fileSystem.read_file_bytes(filePath));
-
-                return BitConverter.ToString(hash).Replace("-", string.Empty);
+                using (var fileStream = _fileSystem.open_file_readonly(filePath))
+                {
+                    var hash = _hashAlgorithm.ComputeHash(fileStream);
+                    return BitConverter.ToString(hash).Replace("-", string.Empty);
+                }
             }
             catch (IOException ex)
             {
-                this.Log().Warn(() => "Error computing hash for '{0}'{1} Hash will be special code for locked file or file too big instead.{1} Captured error:{1}  {2}".format_with(filePath, Environment.NewLine, ex.Message));
+                this.Log().Warn(() => "Error computing hash for '{0}'{1} Hash will be special code for locked file {1} Captured error:{1}  {2}".format_with(filePath, Environment.NewLine, ex.Message));
 
                 if (file_is_locked(ex))
                 {
                     return ApplicationParameters.HashProviderFileLocked;
                 }
 
-                //IO.IO_FileTooLong2GB (over Int32.MaxValue)
-                return ApplicationParameters.HashProviderFileTooBig;
+                //Rethrow if file is not locked
+                throw;
             }
         }