Back out 6e895ec63744 (bug 930202) for frequent 10.7 debug timeouts