You are right. I'm sure when I started this patch a year ago, this was needed, but now it seems to work. Will remove this.