Switch back to unified vigor kernel