Bug 11891: (follow-up) remove custom storage class