Revert "silence "missing field initializers" warning"

This reverts commit ab28b652ebf71e4bc918a13218d40091ffd92a50.

I have a different way to fix this which will be the next commit...
fixup xbrz warnings