Revert "Fixed a missing owner reference"

This reverts commit 6464d4e82da0318652ad1199ebba91e32280cebe.
Revert "Fixed more missing owner references"

This reverts commit d7187e7d357571829f0b88e5ae6368fd95fed6c8.
Moved behavior-logic into trait since behaviors can't override native methods