Revert "(Flash9) use real field name to check for overrides (closes #2785)"

This reverts commit 00ba7931274e2c08f195699859e00cb99ef35c1f.