Merge "Revert "Enable multiple consoles""