diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index d9d3555e..70f5a120 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1961,14 +1961,6 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
                 if (type.getQualifier().hasXfbBuffer())
                     builder.addDecoration(spvType, spv::DecorationXfbBuffer, type.getQualifier().layoutXfbBuffer);
             }
-
-            if (type.getBasicType() != glslang::EbtBlock && (type.getQualifier().storage == glslang::EvqVaryingIn || type.getQualifier().storage == glslang::EvqVaryingOut))
-            {
-                // The layout of a structure type used as an Input or Output depends on whether it is also a Block (i.e. has a Block decoration).
-                // If it is a not a Block, then the structure type must have a Location decoration.
-                if (type.getQualifier().hasLocation())
-                    builder.addDecoration(spvType, spv::DecorationLocation, type.getQualifier().layoutLocation);
-            }
         }
         break;
     default:
diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out
index 89483d9c..f84fa556 100755
--- a/Test/baseResults/spv.430.vert.out
+++ b/Test/baseResults/spv.430.vert.out
@@ -65,7 +65,6 @@ Linked vertex stage:
                               MemberDecorate 60(SS) 0 Flat
                               MemberDecorate 60(SS) 1 Flat
                               MemberDecorate 60(SS) 2 Flat
-                              Decorate 60(SS) Location 0
                               Decorate 62(var) Location 0
                               MemberDecorate 63(MS) 0 Location 17
                               Decorate 63(MS) Block