Revert "Fix exception being thrown if CMHW is not installed."

This reverts commit 1b3eb42781535d6cf5cb740e8b5ecef021b1c1af.