Revert "Fix empty formfield entry #126"

This reverts commit 07b4ae65821b10fdb2168d81993650cbb0f0f291.