[avswitch] revert last commit