Comment 4 for bug 1886852

CW MARS has been using this patch for the past week on training and put it in production last night.

I pushed the fix to master, rel_3_5, and rel_3_4 this morning.

Thanks, Jason Etheridge and Mike Rylander!