(Bsmiles32) backport - replace Wired macro