backout overeager commit of three files into R3682