No ticket: fix for 3.3 to 4.2 interop assertion error.

Do not merge this.