diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec77b4ea..4036e3c17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -485,13 +485,6 @@ ENDIF(COAL_HAS_OCTOMAP)
 
 # Install catkin package.xml
 INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})
-# Allows Colcon to find non-Ament packages when using workspace underlays
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} "")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} DESTINATION share/ament_index/resource_index/packages)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv "prepend-non-duplicate;AMENT_PREFIX_PATH;")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv DESTINATION share/${PROJECT_NAME}/hook)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv "prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv DESTINATION share/${PROJECT_NAME}/hook)
 
 if(COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL)
   include(CMakePackageConfigHelpers)
diff --git a/cmake b/cmake
index b8c5ab9a1..6b0564f45 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b8c5ab9a1acebc0504969d3c0a2cd95ed620bc89
+Subproject commit 6b0564f45af29a90160aafdfd67eb7a07ace48ed