I think we may be able to remove this code path. I think this stuff was only in place for old checkouts.