Backport patch for cinder