Revert "Dthmsg fix hopefully"

This reverts commit b2dc17a9b42288b33ae07eb2af38ddc81407c5f1.