Just to be clear, does this actually fix anything from #410 or does it just remove an unnecessary back-and-forth encoding process?