reset all of these files back to what is in 'master'.
This is an attempt to split this patch into parts that are mechanical, and parts that should be 'interesting'.

Most of these changes are just mechanical, so they'll all end up in the followup branch.