Cleaning up after deleted owners. Totally failing right now.

This reverts commit 0f7a30745999bca00af93cc391ec3d0fb6864023.