Revert static calls in switch