Merge "Revert "Retire obsolete kernel files"" into main