Revert  all broken commits.

Also includes a commit to deal with the now-missing FeedInfo.ArticleKeys field, but there is no commit to handle the now-missing Article.PubDate field.  This latter field will be "fixed" by deleting all of the articles and then refreshing all to have them refetch.