It's very easy to take the headlight assembly out. I've done it, it's a 30 second job with a pair of pliers. I'm waiting to replace mine though until the PROBLEM is resolved, my service managers advise. My service manager owns a DHG with spoted light syndrome and he's waiting too.