Backport r4627 - fix advanscene import