Unbreak per-channel links. Closes #23