Ok, but I guess I lucked out. Applying the suggestion from the other bug report that was closed sufficed to fix our case. Not 100% sure, but this case where I hit this bug, is the only instance of this maybe bug in our codebase.