Yes, came to the same conclusion - it's a pain, but solves the problem permanently.