Revert 88494423 (removal of duplicate parents in the output codepath)