Wip 8622

Patch for the issue described here: http://tracker.ceph.com/issues/8622