Partially rollback 06d7fff. Was breaking requests.

(cherry picked from commit ab96cf1c2e3a9f96205c302220ec1a1ea40c8af1)