Fixed for previous rebase.