diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
index f7330e3..f36d846 100644
--- a/ModuleConfig.cfc
+++ b/ModuleConfig.cfc
@@ -88,9 +88,12 @@ component {
 			name  = "urlStyle",
 			value = variables.settings.urlStyle
 			);
-		binder.map( "Sv4Util@s3sdk" ).to( "#moduleMapping#.models.AmazonS3" );
+		//This change might be based on ignorance but it didn't look correct. 
+		//binder.map( "Sv4Util@s3sdk" ).to( "#moduleMapping#.models.AmazonS3" );
+		binder.map( "Sv4Util@s3sdk" ).to( "#moduleMapping#.models.Sv4Util" );
 
-		binder.map( "Sv2Util@s3sdk" ).to( "#moduleMapping#.models.AmazonS3" );
+		//binder.map( "Sv2Util@s3sdk" ).to( "#moduleMapping#.models.AmazonS3" );
+		binder.map( "Sv2Util@s3sdk" ).to( "#moduleMapping#.models.Sv2Util" );
 	}
 
 
diff --git a/models/AmazonS3.cfc b/models/AmazonS3.cfc
index 5c8b7aa..906b989 100644
--- a/models/AmazonS3.cfc
+++ b/models/AmazonS3.cfc
@@ -337,12 +337,12 @@ component accessors="true" singleton {
 		if ( results.error ) {
 			throw( message = "Error making Amazon REST Call", detail = results.message );
 		}
-
-		if ( len( results.response.LocationConstraint.XMLText ) ) {
+		//Should this return whatever comes from AWS? It seems like hardcoding a potentially wrong answer is not a good idea. 
+		//if ( len( results.response.LocationConstraint.XMLText ) ) {
 			return results.response.LocationConstraint.XMLText;
-		}
+		//}
 
-		return "US";
+		//return "US";
 	}
 
 	/**