Revert "Fix missing import"

This reverts commit 9c75d04a44ebce3a613c13666383e8b5b06dd241.
Revert "Keep phantom_info around while we transition to the new API"

This reverts commit 1065fb8ce254ef3f3922588097363cef878c424b.