faf07af718
This reverts commit 6ffde8fa17dcecd4243be076340a29a3c807f6e0. Reason for revert: it seems like this commit introduced breaking changes, reverting to see if this helps with toos/deployment/30_* script Change-Id: Ib67babfd3683489e1c3afe1264784758791fe44d