Remove last patch since it has undone some of the previous squirrel fixes