Comment out switch type override that was causing switch settings not to stick.