Did not need (or really want)  to remove pat-switch