Add back missing import caused by the merge