This reverts commit 6dbae8b47eb34b9bcfbd0f8c2e4b9e7964763957. Reason for revert: Goes together with this other revert https://review.opendev.org/c/starlingx/tools/+/902237 Change-Id: I46e6a6841c1527268a20dfca67fcef2932c9eb35