Revert "Small script changes"

This reverts commit 5fdfcc6e26a4d5b8b3078df8da064f60ce5841fb.