Bug 25009: Correct Interface on Timeouts