Revert "Expanded deprecated comment, fixed a misspelling of DECRBY."

This reverts commit 076df8c92d0a01eedd16dc152fa9e579ffd2d873.
Revert "Fixed infinite timeout handling. Increased code reuse so that there will be fewer copy and paste errors."

This reverts commit 8f4dbaf89f66445ada0061b443bb37ac254ca915.