Remove accidental import change during rebase