Reverting r223423, test timeout

Was causing dosep to hang in some cases.