Re-add accidentally clobbered yago code