Revert "fix-mixed-struct (patch by Pip Cet)"