Add back missed import after merge