diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 0e77e0ebdeb7..678f1a74bdd1 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -660,8 +660,6 @@ if( ${PYTHON_VERSION_STRING} VERSION_LESS 2.7 )
   message(FATAL_ERROR "Python 2.7 or newer is required")
 endif()
 
-get_filename_component(PYTHON_BASENAME ${PYTHON_EXECUTABLE} NAME)
-
 ######
 # LLVMBuild Integration
 #
diff --git a/llvm/tools/opt-viewer/CMakeLists.txt b/llvm/tools/opt-viewer/CMakeLists.txt
index 1864c2b60b18..19b606933082 100644
--- a/llvm/tools/opt-viewer/CMakeLists.txt
+++ b/llvm/tools/opt-viewer/CMakeLists.txt
@@ -1,28 +1,13 @@
 set (files
-  "optpmap.py"
-  "style.css")
-
-set (generated_files
   "opt-diff.py"
   "opt-stats.py"
   "opt-viewer.py"
-  "optrecord.py")
-
-foreach (file ${generated_files})
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${file})
-endforeach (file)
+  "optpmap.py"
+  "optrecord.py"
+  "style.css")
 
 foreach (file ${files})
   install(PROGRAMS ${file}
     DESTINATION share/opt-viewer
     COMPONENT opt-viewer)
 endforeach (file)
-
-
-foreach (file ${generated_files})
-  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${file}
-    DESTINATION share/opt-viewer
-    COMPONENT opt-viewer)
-endforeach (file)
diff --git a/llvm/tools/opt-viewer/opt-diff.py.in b/llvm/tools/opt-viewer/opt-diff.py
similarity index 98%
rename from llvm/tools/opt-viewer/opt-diff.py.in
rename to llvm/tools/opt-viewer/opt-diff.py
index a561bb626d0b..36e81a5d569a 100755
--- a/llvm/tools/opt-viewer/opt-diff.py.in
+++ b/llvm/tools/opt-viewer/opt-diff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_BASENAME@
+#!/usr/bin/env python
 
 from __future__ import print_function
 
diff --git a/llvm/tools/opt-viewer/opt-stats.py.in b/llvm/tools/opt-viewer/opt-stats.py
similarity index 98%
rename from llvm/tools/opt-viewer/opt-stats.py.in
rename to llvm/tools/opt-viewer/opt-stats.py
index 4f102861663d..f4ee3a7d44e6 100755
--- a/llvm/tools/opt-viewer/opt-stats.py.in
+++ b/llvm/tools/opt-viewer/opt-stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_BASENAME@
+#!/usr/bin/env python
 
 from __future__ import print_function
 
diff --git a/llvm/tools/opt-viewer/opt-viewer.py.in b/llvm/tools/opt-viewer/opt-viewer.py
similarity index 99%
rename from llvm/tools/opt-viewer/opt-viewer.py.in
rename to llvm/tools/opt-viewer/opt-viewer.py
index 288e01ea1d18..4c105886cfdf 100755
--- a/llvm/tools/opt-viewer/opt-viewer.py.in
+++ b/llvm/tools/opt-viewer/opt-viewer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_BASENAME@
+#!/usr/bin/env python
 
 from __future__ import print_function
 
diff --git a/llvm/tools/opt-viewer/optrecord.py.in b/llvm/tools/opt-viewer/optrecord.py
similarity index 99%
rename from llvm/tools/opt-viewer/optrecord.py.in
rename to llvm/tools/opt-viewer/optrecord.py
index 79d377c34faa..f6fd772689a9 100644
--- a/llvm/tools/opt-viewer/optrecord.py.in
+++ b/llvm/tools/opt-viewer/optrecord.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_BASENAME@
+#!/usr/bin/env python
 
 from __future__ import print_function