New busy timeout stuff - going to test it out on a branch for a bit before mainline commit.