Revert "Shove type into source_info"

This reverts commit e90a39aee237cd619d0c20d9878df108031f29d7.

Reason for revert: 304602386

Change-Id: Ib9d31bdadc7511e67f4c7e5731d18e7bf0162bfc
14 files changed