Enabling cinder again

Now that the dependency issue is fixed upstream.