stop-gap fix for #3219 and #3227
stop-gap fix for #3219 and #3227

after @bdarnell pretty much completely grokked what was going on,
this change should prevent those two bugs from happening.

veteranlu/cockroach,glycerine/cockroach,veteranlu/cockroach,vivekmenezes/cockroach,sunya123/cockroach,paperstreet/cockroach,cockroachdb/cockroach,arjun4084346/cockroach,bg451/cockroach,il9ue/cockroach,cockroachdb/cockroach,cockroachdb/cockroach,arjun4084346/cockroach,maxlang/cockroach,vaibhavarora/cockroach,vaibhavarora/cockroach,paperstreet/cockroach,sunya123/cockroach,il9ue/cockroach,petermattis/cockroach,veteranlu/cockroach,marcuswestin/cockroach,vivekmenezes/cockroach,bg451/cockroach,il9ue/cockroach,glycerine/cockroach,paperstreet/cockroach,vivekmenezes/cockroach,il9ue/cockroach,il9ue/cockroach,vivekmenezes/cockroach,arjun4084346/cockroach,arjun4084346/cockroach,il9ue/cockroach,paperstreet/cockroach,glycerine/cockroach,sunya123/cockroach,cockroachdb/cockroach,petermattis/cockroach,marcuswestin/cockroach,vivekmenezes/cockroach,marcuswestin/cockroach,arjun4084346/cockroach,marcuswestin/cockroach,glycerine/cockroach,marcuswestin/cockroach,vaibhavarora/cockroach,cuongdo/cockroach,cockroachdb/cockroach,bg451/cockroach,petermattis/cockroach,nieyy/cockroach,maxlang/cockroach,arjun4084346/cockroach,cuongdo/cockroach,arjun4084346/cockroach,bg451/cockroach,glycerine/cockroach,glycerine/cockroach,vivekmenezes/cockroach,nieyy/cockroach,petermattis/cockroach,cockroachdb/cockroach,petermattis/cockroach,nieyy/cockroach,paperstreet/cockroach,glycerine/cockroach,paperstreet/cockroach,paperstreet/cockroach,cuongdo/cockroach,cuongdo/cockroach,vaibhavarora/cockroach,vaibhavarora/cockroach,bg451/cockroach,sunya123/cockroach,petermattis/cockroach,cuongdo/cockroach,maxlang/cockroach,marcuswestin/cockroach,arjun4084346/cockroach,cuongdo/cockroach,cuongdo/cockroach,veteranlu/cockroach,maxlang/cockroach,vivekmenezes/cockroach,nieyy/cockroach,vaibhavarora/cockroach,il9ue/cockroach,marcuswestin/cockroach,vivekmenezes/cockroach,sunya123/cockroach,petermattis/cockroach,bg451/cockroach,sunya123/cockroach,cockroachdb/cockroach,veteranlu/cockroach,veteranlu/cockroach,maxlang/cockroach,nieyy/cockroach,petermattis/cockroach,vaibhavarora/cockroach,nieyy/cockroach,cockroachdb/cockroach,veteranlu/cockroach,maxlang/cockroach,bg451/cockroach,cuongdo/cockroach,nieyy/cockroach,nieyy/cockroach,sunya123/cockroach,vaibhavarora/cockroach,marcuswestin/cockroach,sunya123/cockroach,glycerine/cockroach,paperstreet/cockroach,il9ue/cockroach,maxlang/cockroach,maxlang/cockroach,veteranlu/cockroach