Xiao asked me to merge for him, and I did it poorly without realizing it before it was too late.
I have reverted this change in a more recent comment.