Revert httplive changes of last merge