Fix command timeout.

Fixes #6232