POC #22510 -- Reworked opting out from a base class form field.

**WIP, not ready for merge!**