Revert "Revert "junkhud 0.6""

This reverts commit d8221aec4c4ce6ef2d19991c170f48ecee4912b1.