Start working on feed images.
Merge.
Hideous hack to extract feed images from feeds.
Back out hideous changes.
Back out hideous changes.
Clean up sed.
Clean-up pre-merge.