I guess here it's not much of a problem, I just wanted to note it since it will be cherry-picked to `1.x-master` later and there needs to be a modification in this line for that branch.