Pull in patch against clean 3.0 tuna tree.  A lot of fuzz but looks sane.