Fix after 2.0.4 merge.