Revert "Replacing data with the type itself for ULTIMATE coolness"

This reverts commit 156a48a371762720f6312fdb94af9a876366105b.