Revert back custom-data-prep change