Actually, I'll leave it in for now, because it is using a string-id.