This reverts commit 61ea90a8.

The series causes a bug where the phython environment is not properly
activated inside the container and as a result commands fail to execute
properly.

Signed-off-by: Ryan Roberts <ryan.roberts@arm.com>