Revert "fix deployment bug"

This reverts commit 4d28f78bf4b7e9d3e35c65a6ca4569859e3bfae6.

Change-Id: Id806f2a6883e7a29b223755679ba0c92f94b8841
Merge "Revert "fix deployment bug"" into dev/experimental