diff --git a/FindBoost.cmake b/FindBoost.cmake
index 6e0d5b239ca6c2808cfdc00a7d625b7189e6004b..8a6f9b5659e869338a57fb2332f6c634306f8912 100644
--- a/FindBoost.cmake
+++ b/FindBoost.cmake
@@ -84,26 +84,26 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
 endforeach()
 
 # Look for libraries specified by COMPONENTS flag
-#set(Boost_LIBRARY_DIRS "Boost_LIBRARY_DIRS-NOTFOUND")
-#find_path(
-#    Boost_LIBRARY_DIRS
-#
-#    NAMES
-#        ${REQUESTED_BOOST_LIBS}
-#
-#    HINTS
-#        ${BOOST_LIBRARYDIR}
-#        $ENV{BOOST_LIBRARYDIR}
-#        ${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost
-#
-#    PATHS
-#        /usr/lib/boost
-#        /usr/lib/x86_64-linux-gnu
-#
-#    PATH_SUFFIXES
-#        stage/lib
-#        lib
-#)
+set(Boost_LIBRARY_DIRS "Boost_LIBRARY_DIRS-NOTFOUND")
+find_path(
+    Boost_LIBRARY_DIRS
+
+    NAMES
+        ${REQUESTED_BOOST_LIBS}
+
+    HINTS
+        ${BOOST_LIBRARYDIR}
+        $ENV{BOOST_LIBRARYDIR}
+        ${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost
+
+    PATHS
+        /usr/lib/boost
+        /usr/lib/x86_64-linux-gnu
+
+    PATH_SUFFIXES
+        stage/lib
+        lib
+)
 
 # Construct list of libraries' names and make them
 # targets, so they may be linked
@@ -118,15 +118,8 @@ foreach(LIBNAME ${REQUESTED_BOOST_LIBS})
         NAMES
         ${LIBNAME}
 
-        HINTS
-            ${BOOST_LIBRARYDIR}
-            $ENV{BOOST_LIBRARYDIR}
-            ${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost
-
         PATHS
             ${Boost_LIBRARY_DIRS}
-            /usr/lib/boost
-            /usr/lib/x86_64-linux-gnu
 
         PATH_SUFFIXES
             stage/lib