This reverts commit b1b09d4085.
Reason for revert: Introducing regression, Any volume extension operation fails.
This revert is legit for Zed, and doesn't introduce any other regression
Change-Id: I0e72f3b74209120fd82ae55c5951fe5e878c124f
(cherry picked from commit 13c2cec675)