Fix cpp models that got broken by an incorrect refactoring
Fix cpp models that got broken by an incorrect refactoring

Reviewed By: jberdine

Differential Revision: D3819759

fbshipit-source-id: aa577dc

blzq/infer,ryoon/infer,jsachs/infer,kageiit/infer,xennygrimmato/infer,facebook/infer,kageiit/infer,facebook/infer,jvillard/infer,xennygrimmato/infer,jvillard/infer,facebook/infer,blzq/infer,kageiit/infer,jvillard/infer,facebook/infer,jsachs/infer,kageiit/infer,kageiit/infer,facebook/infer,jsachs/infer,ropas/infer,blzq/infer,xennygrimmato/infer,facebook/infer,ropas/infer,jsachs/infer,xennygrimmato/infer,kageiit/infer,kageiit/infer,blzq/infer,jsachs/infer,ropas/infer,ropas/infer,jvillard/infer,blzq/infer,ryoon/infer,ryoon/infer,jvillard/infer,xennygrimmato/infer,xennygrimmato/infer,ryoon/infer,facebook/infer,ryoon/infer,jvillard/infer,xennygrimmato/infer,ropas/infer,ropas/infer,blzq/infer,ryoon/infer,jsachs/infer,jvillard/infer