Remove interface flipping in Decoupled/Valid