Restore r223709 as it was meant to be, and enable FeatureP8Vector for P8