Revert "Merged master"

This reverts commit 84dd72bdb489196ca499996b2f640fed314e141a.
Revert "broke some code out to private method, per paul's suggestion, in OwnershipArbiter"

This reverts commit 11aedaff0143ccb4e1684acc98fca31fbe060c71.