Fixed build errors caused by 2.4 merge.

No match.