Fix up vertex instance for has_one
Aaand, remove that commit