I pushed a timeout-troubleshooting change to a PR with auto-merge enabled, so this PR reverts the test config change.