diff --git a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/ElasticSearch.Net.Aws.IntegrationTests.csproj b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/ElasticSearch.Net.Aws.IntegrationTests.csproj
index 0382299..097a980 100644
--- a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/ElasticSearch.Net.Aws.IntegrationTests.csproj
+++ b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/ElasticSearch.Net.Aws.IntegrationTests.csproj
@@ -17,8 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
     <PackageReference Include="NUnit" Version="3.7.*" />
-    <PackageReference Include="NEST" Version="6.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="NEST" Version="2.5.8" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
   </ItemGroup>
 
diff --git a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PingTests.cs b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PingTests.cs
index 5634ce2..6c638de 100644
--- a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PingTests.cs
+++ b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PingTests.cs
@@ -20,7 +20,7 @@ public void Ping_should_work()
             var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
             var config = new ConnectionConfiguration(pool, httpConnection);
             var client = new ElasticLowLevelClient(config);
-            var response = client.Ping<VoidResponse>();
+            var response = client.Ping<object>();
             Assert.AreEqual(200, response.HttpStatusCode.GetValueOrDefault(-1));
 
         }
@@ -44,7 +44,7 @@ public void Random_encoded_url_should_work()
             var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
             var config = new ConnectionConfiguration(pool, httpConnection);
             var client = new ElasticLowLevelClient(config);
-            var response = client.Get<BytesResponse>(randomString, string.Join(",", Enumerable.Repeat(randomString, 2)), randomString);
+            var response = client.Get<Stream>(randomString, string.Join(",", Enumerable.Repeat(randomString, 2)), randomString);
             Assert.AreEqual(404, response.HttpStatusCode.GetValueOrDefault(-1));
         }
 
@@ -55,7 +55,7 @@ public void Asterisk_encoded_url_should_work()
             var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
             var config = new ConnectionConfiguration(pool, httpConnection);
             var client = new ElasticLowLevelClient(config);
-            var response = client.Get<BytesResponse>("index*", "type", "id");
+            var response = client.Get<Stream>("index*", "type", "id");
             Assert.AreEqual(404, response.HttpStatusCode.GetValueOrDefault(-1));
         }
     }
diff --git a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PostTests.cs b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PostTests.cs
deleted file mode 100644
index 117e25f..0000000
--- a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PostTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Elasticsearch.Net;
-using Elasticsearch.Net.Aws;
-
-namespace IntegrationTests
-{
-    [TestFixture]
-    public class PostTests
-    {
-        private static string Region => TestConfig.Region;
-
-        string _indexName;
-        ElasticLowLevelClient _client;
-
-        [SetUp]
-        public void Setup()
-        {
-            var httpConnection = new AwsHttpConnection(Region);
-            var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
-            var config = new ConnectionConfiguration(pool, httpConnection);
-            _client = new ElasticLowLevelClient(config);
-            _indexName = $"unittest_{Guid.NewGuid().ToString("n")}";
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            _client.IndicesDelete<VoidResponse>(_indexName);
-        }
-
-        [Test]
-        public void SimplePost_should_work()
-        {
-            var id = Guid.NewGuid().ToString("n");
-            var response = _client.Create<VoidResponse>(_indexName, "test", id, PostData.Serializable(new { message = "Hello, World!" }));
-            Assert.AreEqual(true, response.Success);
-            var getResponse = _client.Get<StringResponse>(_indexName, "test", id);
-            Assert.AreEqual(true, getResponse.Success);
-            StringAssert.Contains("Hello, World!", getResponse.Body);
-        }
-    }
-}
diff --git a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/ElasticSearch.Net.Aws.Tests.csproj b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/ElasticSearch.Net.Aws.Tests.csproj
index e3addf9..28f75e5 100644
--- a/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/ElasticSearch.Net.Aws.Tests.csproj
+++ b/src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/ElasticSearch.Net.Aws.Tests.csproj
@@ -17,16 +17,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
     <PackageReference Include="NUnit" Version="3.7.*" />
-    <PackageReference Include="NEST" Version="6.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="NEST" Version="2.5.8" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Elasticsearch.Net" Version="6.0.1" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj b/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj
index b74a369..fa7ec36 100644
--- a/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj
+++ b/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>6.1.0</VersionPrefix>
+    <VersionPrefix>2.5.8</VersionPrefix>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <AssemblyName>Elasticsearch.Net.Aws</AssemblyName>
-    <PackageId>Elasticsearch.Net.Aws</PackageId>
-    <PackageVersion>6.1.0</PackageVersion>
+    <PackageId>bcuff.Elasticsearch.Net.Aws-v2</PackageId>
+    <PackageVersion>2.5.8</PackageVersion>
     <Authors>Brandon Cuff</Authors>
     <Description>Enables request signing necessary for using the AWS Elasticsearch service.</Description>
     <Copyright>Copyright 2015</Copyright>
@@ -14,9 +14,9 @@
     <PackageReleaseNotes>Use AWSSDK.Core to get credentials instead of custom code.</PackageReleaseNotes>
     <PackageTags>elasticsearch elastic search aws amazon</PackageTags>
     <RepositoryUrl>https://github.com/bcuff/elasticsearch-net-aws</RepositoryUrl>
-    <AssemblyVersion>6.1.0</AssemblyVersion>
-    <FileVersion>6.1.0</FileVersion>
-    <Version>6.1.0</Version>
+    <AssemblyVersion>2.5.8</AssemblyVersion>
+    <FileVersion>2.5.8</FileVersion>
+    <Version>2.5.8</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="3.3.17.9" />
-    <PackageReference Include="Elasticsearch.Net" Version="6.*" />
+    <PackageReference Include="Elasticsearch.Net" Version="2.5.*" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 
@@ -39,8 +39,4 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.1.2" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/SignV4Util.cs b/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/SignV4Util.cs
index 792e1e7..943dd9b 100644
--- a/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/SignV4Util.cs
+++ b/src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/SignV4Util.cs
@@ -157,18 +157,9 @@ private static void WriteSignedHeaders(Dictionary<string, string> canonicalHeade
             }
         }
 
-#if !NETSTANDARD
          private static NameValueCollection ParseQueryString(string query) =>
             System.Web.HttpUtility.ParseQueryString(query);
-#else
-        private static NameValueCollection ParseQueryString(string query) =>
-            Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(query)
-                .Aggregate(new NameValueCollection(), (col, kv) =>
-                {
-                    kv.Value.ToList().ForEach(v => col.Add(kv.Key, v));
-                    return col;
-                });
-#endif
+
         public static string GetCanonicalQueryString(this Uri uri)
         {
             if (string.IsNullOrWhiteSpace(uri.Query)) return string.Empty;