diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10dd80f26b47e0bcaa1cc9893aaa9aae30cedeb1..4b5647479d356713e1f5c95dab95341773d9ae25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -515,7 +515,6 @@ build-codec-instrumented-linux:
   timeout: "10 minutes"
   script:
     - *print-common-info
-    - *activate-Werror-linux
     - ./scripts/prepare_instrumentation.sh
     - make -j -C scripts/c-code_instrument
 
diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh
index f72c3f28d573dbd765342fd14252bac2247d6394..4ed7098442b93ab58b6a5fddfd5065dda5137da8 100755
--- a/scripts/prepare_instrumentation.sh
+++ b/scripts/prepare_instrumentation.sh
@@ -189,9 +189,13 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u
 "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null
 # ISAR post-renderer and lc3plus sources only need to be instrumented in float code
 if [ "$PROJECT" = "FLOAT" ]; then
+    for bak_file in $targetdir/lib_rend/*.bak; do mv "$bak_file" "${bak_file%.*}"; done      # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool
     "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null
+    for bak_file in $targetdir/lib_lc3plus/*.bak; do mv "$bak_file" "${bak_file%.*}"; done      # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool
+    for bak_file in $targetdir/lib_lc3plus/fft/*.bak; do mv "$bak_file" "${bak_file%.*}"; done      # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool
     "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null
 else
+    for bak_file in $targetdir/lib_rend/*.bak; do mv "$bak_file" "${bak_file%.*}"; done      # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool
     "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null
 fi