diff --git a/packages/intrepid/CMakeLists.txt b/packages/intrepid/CMakeLists.txt
index f4b1a7df3eeb..05b12fb171b2 100644
--- a/packages/intrepid/CMakeLists.txt
+++ b/packages/intrepid/CMakeLists.txt
@@ -10,7 +10,13 @@ TRIBITS_PACKAGE(Intrepid)
 # B) Set up package-specific options
 #
 
-SET(INTREPID_OLD_KOKKOS_CODE FALSE)
+SET(Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE_DEFAULT OFF)
+SET(INTREPID_OLD_KOKKOS_CODE_DEFAULT FALSE)
+
+IF(Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE)
+ELSE()
+  SET(INTREPID_OLD_KOKKOS_CODE FALSE)
+ENDIF()
 
 IF(Amesos_ENABLE_UMFPACK)
   SET(${PACKAGE_NAME}_ENABLE_AMESOS_UMFPACK_DEFAULT ON)
diff --git a/packages/intrepid/src/CMakeLists.txt b/packages/intrepid/src/CMakeLists.txt
index 3415cb156942..4936eab7a730 100644
--- a/packages/intrepid/src/CMakeLists.txt
+++ b/packages/intrepid/src/CMakeLists.txt
@@ -63,6 +63,7 @@ APPEND_SET(HEADERS
   APPEND_SET(HEADERS ${HEADERS}
   Kokkos/Intrepid_KokkosRank.hpp
   )
+IF (Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE) 
 IF (HAVE_INTREPID_KOKKOSCORE AND KOKKOS_ENABLE_CUDA)
   IF( TPL_ENABLE_MPI )
       CUDA_INCLUDE_DIRECTORIES( ${MPI_BASE_DIR}/include )
@@ -97,6 +98,7 @@ IF(HAVE_INTREPID_KOKKOSCORE)
   Kokkos/Intrepid_KokkosRank.hpp
   )	
 ENDIF()
+ENDIF()
 
 
 #
@@ -261,7 +263,7 @@ APPEND_SET(HEADERS
   Cell/Intrepid_CellTools.hpp
   Cell/Intrepid_CellToolsDef.hpp
   )
-IF(HAVE_INTREPID_KOKKOSCORE)
+IF(INTREPID_OLD_KOKKOS_CODE)
   APPEND_SET(HEADERS
     Cell/Intrepid_CellTools_Kokkos.hpp
   )
diff --git a/packages/intrepid/src/Kokkos/Intrepid_FieldContainer_Kokkos.hpp b/packages/intrepid/src/Kokkos/Intrepid_FieldContainer_Kokkos.hpp
index de3e3451b436..960d00d6f7b9 100644
--- a/packages/intrepid/src/Kokkos/Intrepid_FieldContainer_Kokkos.hpp
+++ b/packages/intrepid/src/Kokkos/Intrepid_FieldContainer_Kokkos.hpp
@@ -1,3 +1,4 @@
+#ifdef Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE
 
 #ifndef INTREPID_FIELDCONTAINER_KOKKOS_HPP
 #define INTREPID_FIELDCONTAINER_KOKKOS_HPP
@@ -360,3 +361,5 @@ struct Return_Type<const Intrepid::FieldContainer_Kokkos<FadType, Layout, Device
 #include "Intrepid_FieldContainer_Kokkos_Serial_Left.hpp"
 #include "Intrepid_FieldContainer_Kokkos_Serial_Right.hpp"
 #endif
+
+#endif