Fix backward compat issue

Well that was stupid.  Immutable variables, etc.

Partial-Bug: #1269856