switch back to CM s4-common