These 2 patches have merged, so are only needed when using $LKG