I have had the same problem. Worked through it as above, replacing the files. Then came up with a further file error – “Fatal error: Call to undefined function: add_filter() in website/wp-includes/default-filters.php on line 4.
I have tried deleting this file and uploading a fresh copy as ascii. However the same error is repeated each time I perform this action.
Anyone got a solution.