Revert "Owner: Speed up joins on connect (needs testing)"

This reverts commit 453facdf971355806a59fc48a5ba4743a9b0035c.