What is presented in this diff appears equivalent...