diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index b306c0c70d3a04339bf9a76a7de7bd65e318c979..ae6a5773dce93531422cc8cfd75d0b25153201cc 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -218,37 +218,6 @@ MACRO(GENERATE_GUID VarName)
  OUTPUT_STRIP_TRAILING_WHITESPACE)
 ENDMACRO()
 
-# Make sure that WIX identifier created from a path matches all the rules:
-# - it is shorter than 72 characters
-# - doesn't contain reserver characters ('+', '-' and '/')
-# ID_SET contains a global list of all identifiers which are too long.
-# Every time we use an identifier which is too long we use its index in
-# ID_SET to shorten the name.
-SET_PROPERTY(GLOBAL PROPERTY ID_SET)
-MACRO(MAKE_WIX_IDENTIFIER str varname)
-  STRING(REPLACE "/" "." ${varname} "${str}")
-  STRING(REPLACE "+" "p" ${varname} "${str}")
-  STRING(REPLACE "-" "m" ${varname} "${str}")
-  STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}")
-  STRING(LENGTH "${${varname}}" len)
-  # FIXME: the prefix length has to be controlled better
-  # Identifier should be smaller than 72 character
-  # We have to cut down the length to 40 chars, since we add prefixes
-  # pretty often
-  IF(len GREATER 40)   
-    STRING(SUBSTRING  "${${varname}}" 0 37 shortstr)
-    GET_PROPERTY(LOCAL_LIST GLOBAL PROPERTY ID_SET)
-    LIST(FIND LOCAL_LIST "${${varname}}" STRING_ID)
-    IF(${STRING_ID} EQUAL -1)
-      LIST(APPEND LOCAL_LIST "${${varname}}")
-      SET_PROPERTY(GLOBAL PROPERTY ID_SET "${LOCAL_LIST}")
-      LIST(LENGTH LOCAL_LIST STRING_ID)
-      MATH(EXPR STRING_ID "${STRING_ID}-1" )
-    ENDIF()
-    SET(${varname} "${shortstr}${STRING_ID}")
-  ENDIF()
-ENDMACRO()
-
 FUNCTION(TRAVERSE_FILES dir topdir file file_comp  dir_root)
   FILE(RELATIVE_PATH dir_rel ${topdir} ${dir})
   IF(dir_rel)