#22541 changed the logic for handling fields not resolving.
The approach of checking first did not work on setups where 
the work files app was running a project-only level setting.