Admit defeat for today, cleanly fixing this bug requires some larger refactoring in the server which showed even more issues that need to be addressed first.