Revert "Prefer joiner to custom joining"

This reverts commit f25833be936f4d8125fd8442912badc083093081.