Issue #2226233 by ckrina, alexrayu, Manuel Garcia, Cottser: Redo changes from field.module to Twig conversion issue that were clobbered.