Revert "data variable type update"

This reverts commit 24c0a8760f5d48ec4013bb04228de225e41c5721.