Revert workarounds in a few project as I was able to solve the root cause in the kernel KBuild