             
             // Restore targetNavigator properties.
             targetNavigator.includeInLayout = navigatorProps.targetNavigatorIncludeInLayout;
+
+            // Restore the target navigator to normal layout mode if 
+            // that's the mode it was in before the transition.
+            if (!navigatorProps.usesAdvancedLayout)
+                targetNavigator.clearAdvancedLayoutFeatures();
         }
 
         transitionGroup = null;

        startView.includeInLayout = false;
        
        // Disable end view layout.
        endViewProps = { includeInLayout:endView.includeInLayout }; 
        endView.includeInLayout = false;
        
        // Save our end view's transform matrix.

                
        // Disable layout for our targetNavigator temporarily.
        navigatorProps.targetNavigatorIncludeInLayout = targetNavigator.includeInLayout;
        navigatorProps.usesAdvancedLayout = (targetNavigator._layoutFeatures != null);
        targetNavigator.includeInLayout = false;
    }

