This will save time waiting for timeout to expire. Upstream-commit: 11a6221a830d7ffc3291e5b8749e364b18e07626 Component: packaging