It technically wouldn't break backwards-compatibility, but I considered that this was really just an issue with EAP, so only do it for EAP. Naturally, it can just be replaced with your suggestion below that it should just always create a new instance. :-)