Null merge related to #18600.

For 3.3, we just deleted the example.  In 3.4 it was fixed.