These 2 patches have merged so only apply them when using $LKG.