rollback aae8f8f3ff because the fix moved to Cinder-NI