Revert "These fixes allow the Cmake find_package infrastructure to work correctly"
Revert "These fixes allow the Cmake find_package infrastructure to work correctly"

This reverts commit cfee500608a823cdbed751ed4cd7675cef519561.

mit-crpg/openmc,amandalund/openmc,shikhar413/openmc,walshjon/openmc,liangjg/openmc,smharper/openmc,shikhar413/openmc,walshjon/openmc,mit-crpg/openmc,paulromano/openmc,walshjon/openmc,amandalund/openmc,smharper/openmc,amandalund/openmc,walshjon/openmc,mit-crpg/openmc,liangjg/openmc,smharper/openmc,paulromano/openmc,liangjg/openmc,shikhar413/openmc,paulromano/openmc,liangjg/openmc,amandalund/openmc,paulromano/openmc,mit-crpg/openmc,shikhar413/openmc,smharper/openmc