Revert "Converted TH1/TH2 to Heavy"

This reverts commit db225f3857ce88c640808fa22e50f232dbea6fe2.