Issue #3076862 by simeonkesmev: Avoid depending on 'field_' field name prefix for determining bundle fields

Closes #3076862

Whoops, applied the patch to the wrong branch and created the merge request incorrectly too. Will try again shortly.

closed