Merge "Revert "Fix an assertion triggered when using anonymous structs in kernel""