fix for not nullifying hasone association on save; introduces regression in test_collect_children