fix for #2818
fix for #2818

@tirsen
I still need to figure out how to test this. But existing tests
are passing for now. Can you let me know if this fixes your problem?

applift/vitess,dcadevil/vitess,tinyspeck/vitess,HubSpot/vitess,davygeek/vitess,dcadevil/vitess,applift/vitess,vitessio/vitess,mattharden/vitess,vitessio/vitess,enisoc/vitess,sougou/vitess,HubSpot/vitess,tirsen/vitess,vitessio/vitess,pivanof/vitess,sougou/vitess,applift/vitess,mahak/vitess,mattharden/vitess,enisoc/vitess,mahak/vitess,applift/vitess,sougou/vitess,mattharden/vitess,davygeek/vitess,pivanof/vitess,enisoc/vitess,alainjobart/vitess,vitessio/vitess,sougou/vitess,tirsen/vitess,davygeek/vitess,alainjobart/vitess,tinyspeck/vitess,mattharden/vitess,tirsen/vitess,tirsen/vitess,HubSpot/vitess,alainjobart/vitess,rnavarro/vitess,pivanof/vitess,HubSpot/vitess,mattharden/vitess,dcadevil/vitess,davygeek/vitess,enisoc/vitess,rnavarro/vitess,alainjobart/vitess,vitessio/vitess,alainjobart/vitess,tirsen/vitess,rnavarro/vitess,dcadevil/vitess,applift/vitess,pivanof/vitess,mattharden/vitess,mattharden/vitess,mahak/vitess,applift/vitess,applift/vitess,alainjobart/vitess,enisoc/vitess,applift/vitess,rnavarro/vitess,HubSpot/vitess,davygeek/vitess,mahak/vitess,rnavarro/vitess,vitessio/vitess,sougou/vitess,mahak/vitess,pivanof/vitess,mahak/vitess,mattharden/vitess,pivanof/vitess,pivanof/vitess,enisoc/vitess,tinyspeck/vitess,pivanof/vitess,mahak/vitess,tirsen/vitess,dcadevil/vitess,sougou/vitess,mattharden/vitess,davygeek/vitess,HubSpot/vitess,alainjobart/vitess,vitessio/vitess,alainjobart/vitess,vitessio/vitess,enisoc/vitess,applift/vitess,mattharden/vitess,dcadevil/vitess,tinyspeck/vitess,tinyspeck/vitess,applift/vitess,tirsen/vitess,sougou/vitess,pivanof/vitess,tirsen/vitess,HubSpot/vitess,tirsen/vitess,tinyspeck/vitess,dcadevil/vitess,rnavarro/vitess,sougou/vitess,rnavarro/vitess,tinyspeck/vitess,rnavarro/vitess,mahak/vitess,davygeek/vitess,rnavarro/vitess,HubSpot/vitess