Fix/hack to make has_one restoration work

It ain't pretty, but hopefully it works.