Revert "Temporary fix to E2E test to unblock release"

This reverts commit 1236a3c.

Author: jterapin

build_tools/aws-sdk-code-generator/spec/protocol_tests_spec_helper.rb

@@ -314,7 +314,13 @@ def match_resp_data(test_case, http_resp, it)
         expected_data =
           if error_case?(test_case)
             error_shape = http_resp.context.operation.errors.find do |err|
-              err.shape.name == test_case['errorCode']
+              shape =
+                if err.shape['error']
+                  err.shape['error']['code']
+                else
+                  err.shape.name
+                end
+              shape == test_case['errorCode']
             end
             raise "Unable to find #{test_case['errorCode']} in error shapes" if error_shape.nil?