Revert one more commit that shouldn't be in the 1.6 tree.

This reverts commit 57e0371ae622893081ab7595ef9618026017d785.

Conflicts:
	lib/restclient/request.rb
Another null merge to resync with the 1.6 branch