diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a72854a6..7b0288748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,15 +48,13 @@ if(${GTSAM_SOURCE_DIR} STREQUAL ${GTSAM_BINARY_DIR})
   message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt. ")
 endif()
 
-# TODO(kartikarcot): Determine a proper home for this option
-# a flag to enable or disable serialization with GTSAM_ENABLE_BOOST_SERIALIZATION
+# Enable or disable serialization with GTSAM_ENABLE_BOOST_SERIALIZATION
 option(GTSAM_ENABLE_BOOST_SERIALIZATION "Enable Boost serialization" ON)
-option(GTSAM_USE_BOOST_FEATURES "Enable Features that use Boost" OFF)
-# set a compiler flag to enable or disable serialization with GTSAM_DISABLE_BOOST_SERIALIZATION
 if(GTSAM_ENABLE_BOOST_SERIALIZATION)
   add_definitions(-DGTSAM_ENABLE_BOOST_SERIALIZATION)
 endif()
 
+option(GTSAM_USE_BOOST_FEATURES "Enable Features that use Boost" ON)
 if(GTSAM_USE_BOOST_FEATURES)
   add_definitions(-DGTSAM_USE_BOOST_FEATURES)
 endif()