The main fix here is to stop using container features if we're already
inside a container, as this triggers some bugs.

Git-EVTag-v0-SHA512: b3f43b4f3040563d130d5e2f6fdbf3b76661fb60b3736ed501132bb65e1cc3154821b7ac911d198675fa1c5131b9221dc70ee8b35884f5c4701b8b96bdf74a64