Revert "Refactoring cinder support"

This needs to wait for "Migration to conductor" patch merged

This reverts commit 1c6b4709c089a548962579334f450806b73e26f6