Revert the workaround for one2many, the bug is resolved