container: add the RawTerminal logic again

Sorry about the mess x)