Migration to separate out segment data
Revert "Migration to separate out segment data"

This reverts commit 69ed4803e5f2eb0a3fed90637cc1f28346fa45b8.