Revert r345214
It's best to not repeat the mistake I made in r300167; I should use NO_WCAST_ALIGN instead.