diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 8c85f8865..4e1eb4c26 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -68,17 +68,15 @@
  * any function call which actually allocates a Curl_addrinfo struct.
  */
 
+#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
+    defined(__unix__) &&  defined(__i386__)
+#   pragma optimize("", off)
+#endif
+
 void
 Curl_freeaddrinfo(Curl_addrinfo *cahead)
 {
-#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
-    defined(__unix__) &&  defined(__i386__)
-  /* workaround icc 9.1 optimizer issue */
-  volatile Curl_addrinfo * volatile ca;
-  volatile Curl_addrinfo * volatile canext;
-#else
   Curl_addrinfo *ca, *canext;
-#endif
 
   for(ca = cahead; ca != NULL; ca = canext) {
 
@@ -94,6 +92,10 @@ Curl_freeaddrinfo(Curl_addrinfo *cahead)
   }
 }
 
+#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
+    defined(__unix__) &&  defined(__i386__)
+#   pragma optimize("", on)
+#endif
 
 #ifdef HAVE_GETADDRINFO
 /*