GI-1149 Brought in a fix in cocos that didn't exist in our branch.