Disable previously (simpleswitcher) broken code, as fixing it seems to break more stuff.