Revert "ciscripts: Fix merge conflict"
Revert "ciscripts: Fix merge conflict"

This reverts commit 711bdaf892556df773fd64f60d9bd1e83a30f3ce.

polysquare/polysquare-ci-scripts,polysquare/polysquare-ci-scripts