Revert "Support CustomData"

This reverts commit 0e7af6cbcdb509f336e8fb0b1b92265dd59901a1.