Wip 4517

Fixes http://tracker.ceph.com/issues/4517