Move __owner__ off of props