Reverting some files back to the correct state, as some changes were overwritten