Issue #2560411 by davidhernandez: The same CSS classes are being added to the field wrapper and field item