Back out e386c02b4b9a (bug 963324) for timeouts in the reftests it added
CLOSED TREE