Partially revert last Gnus merge