Switch to non-snapshot storemate again