No, I don't agree.  This bug isn't sufficiently important to take without doing the refactoring work.

The refactoring needs to be done as part of this pull request, otherwise it won't ever be done.