Actually backported KAMI to j6.