Issue #2184387 by alexpott, sun: Remove SchemaStorage.