Revert "Work in progress for better Native Test Suite Container"

This reverts commit ade1823b0e253d2e0756e0f19f08f71418d80cdf.