VE-1261 Using super

DO NOT MERGE

Not required for upstream sync work. Can be applied when we're ready.

@inez