Reverted recent changes to add_boost.cmake pending further assessment.