Pick up change to remove NNTP code.