Fixed breakage from rebase.