Revert "Removes unneeded fields"

This reverts commit 52c31639011f5fd9b5f91f8bfba4276ab2dfcbb1.

I might have been too forward on this.