Hm this again.  I really need to examine this and figure out why it is needed.  i'll checkout this PR and give it a shot and report back here