Partially rollback 06d7fff. Was breaking requests.