Fix broken build from a bad rebase.