Several weeks ago, I took our Q7 in for service because in heavy rain or a car wash, water would leak onto the passenger floor. Dealer said they cleaned the sunroof drain tubes. We don't have a sunroof but I guess the same drain tubes exist.

Now, several weeks later, water is again leaking in badly.

Has anyone had this problem in an '07 and had it satisfactorily repaired by the dealer? I've heard this is a common problem with the '07 model.