Fix a race condition causing COOS.

@rev eric.anderson@
Merging origin/goliver/master-pending-race-fix into master