Revert "Fix for smile count in deploy_simple_cinder"

This reverts commit 14bed4a9ee105ba18596fa92a801151c908d8a8d.

Change-Id: I31d610e7afdf80bf71d233df54bfa381bc93a90d
Merge "Revert "Fix for smile count in deploy_simple_cinder""