reapplying VOLDEV-32 fix