switching: Remove the drain and resume code from the switching code.