undo premature optimization in pi-switch