Restored disabling of simple-navigation selected persistence within build session.