Bug 201405: Backed out the previous checkin.  It caused the timeout test to hang.
Bug 201405: Backed out the previous checkin.  It caused the timeout test to
hang.

makotokato/nsprpub,makotokato/nsprpub,makotokato/nsprpub,makotokato/nsprpub,makotokato/nsprpub