i cherry-picked

1702d98489ff44ddcb4ccdc1e470e84356051455

to 1.9.x (under the impression this fixes the nailgun error), but then ity showed me an example of the error occurring in a 1.10.x internal release (which has that commit in it). i'm going to try to repro the error from the 1.10.x internal branch and if it appears i will push up the fix that i mentioned last week that for me absolutely removed the error (hopefully)