Revert "[JBJCA-1068] Field type fix"

This reverts commit c9f31e670f98f284370e4e2e4f1367a2d4311440.