Revert "Temporarily add padding to nested struct to ensure word alignment." am: d93651340e * commit 'd93651340e362a54ae148899a0106d55aaf04b8e': Revert "Temporarily add padding to nested struct to ensure word alignment."