Add manual HT BUID fixup to detect previously set BUIDs in early init. This fixes...