Add SystemSwitch again

Maybe now it will build