This breaks TestQuotaTableUtil.testDeleteSnapshots. This reverts commit fe7cf10272a74992e4186b1763c5194ecabc7c62.