Commit totally broke all deployment CI job. This reverts commit 24477c590b. Change-Id: Idce0954f0bd363095069e91edc6941ca78b22c60
24477c590b