Revert "Joins and quits"

This reverts commit 06b3ad021a60dbe1ad3ff519fc4978455c4f4b3c.