This reverts commit caadcc3ed8.
caadcc3ed8
- Ensure all actions accessing storage lock properly. - Behavior change: policies can be deleted only when they are not associated with any active credentials.