bundled again since thread-safe-0.30 was yanked