[backfire/packages] revert accidentally committed modeswitch changes from r29036