Revert "Followed through with the timeout more thoroughly."

This reverts commit 5eccc262b3510527649c3479bb82c3c3f8e17f66.
Updated cipher list, now includes all ciphers defined in IANA list.