backout change on master, will branch.
initial swipe at twitter photo-card support.