Temporarily remove new checkcalls so that model gen will work on vanilla herd