FileStore-only version for robconery's biggy