Fixes Bug #1205178 (https://bugs.launchpad.net/cinder/+bug/1205178)