Revert "Revert "Revert "remove cmhw""" - not the problem.

This reverts commit 60f4945780eba8d05e2db4fada640d2fd79b3a9d.