Yes, I agree with you. I would carefully strip it right back and re-attach at the board itself.
In Gerry's defence, he did say it would take a while and didn't want to spend too much time on it.
However, for me time is not an issue for my own goods. I would prefer the proper strip down and fix...