Revert r188449 as it turns out we're just missing the instructions that need the v16i32/v16f32 matching.