Re-commit. Could run in Win32.