Bugfix: storage calc on deleted buckets (porting to 1.5)

Porting to `release/1.5` of #993.