This commit causes a segfault when parsing destinations that are | delimited. This patchset needs to be tested further before inclusion into the tree. This reverts commit b11955db.