migrated to id based source_col

Change-Id: I27e7fb11972bd4c0e3faf203f4517ae7d6f9e619