Fix build error due to rebase confusion