Don't merge! Just a sample.

Comment From: philwebb

This will unfortunately break back-compatibility. Let's continue the discussion in #24237 to see if there are other options.