This reverts commit 2a84d259. Broke regression test on test_hwm.cpp.
Attach a file by drag & drop or click to upload
