diff --git a/docs/changes.txt b/docs/changes.txt
index 7021b9f83..b1243bd65 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -73,7 +73,6 @@
 - OpenCL Kernels: Removed some include functions that are no longer needed to reduce compile time
 - OpenCL Runtime: Fall back to 64 threads default (from 256) on AMD GPU to prevent creating too many workitems
 - OpenCL Runtime: Forcing OpenCL 1.2 no longer needed. Option removed from build options
-- OpenCL Runtime: Set OpenCL build option -O2 fixed for ROCm and AMDGPU-PRO using AMD_OCL_BUILD_OPTIONS_APPEND
 - Restore: Fixed the version number used in the restore file header
 - Time: added new type for time measurements hc_time_t and related functions to force the use of 64 bit times
 
diff --git a/src/shared.c b/src/shared.c
index 7171e297e..125c4c8a5 100644
--- a/src/shared.c
+++ b/src/shared.c
@@ -334,10 +334,6 @@ void setup_environment_variables ()
       putenv ((char *) "DISPLAY=:0");
   }
 
-  //We need to force this
-  //if (getenv ("AMD_OCL_BUILD_OPTIONS_APPEND") == NULL)
-    putenv ((char *) "AMD_OCL_BUILD_OPTIONS_APPEND=-O2");
-
   if (getenv ("OCL_CODE_CACHE_ENABLE") == NULL)
     putenv ((char *) "OCL_CODE_CACHE_ENABLE=0");