Remove bad bigswitch bug