Thanks!
ebcode → created an issue.
I have a patch that removes the once call from #3386191. This will break that fix, of course, but if you didn't have that problem, then this will fix what that broke. It seems that a more complicated patch will be required to fix both issues.