Fix failed v2.1 merge.