Revert "HGAddon"

This reverts commit 2b0041b0b33e9e457fdb2a4969167aa27800ba24.