Partially revert TS-3104
Partially revert TS-3104

taoyunxing/trafficserver,reveller/trafficserver,clearswift/trafficserver,persiaAziz/trafficserver,SolidWallOfCode/trafficserver,rahmalik/trafficserver,SolidWallOfCode/trafficserver,bryancall/trafficserver,duke8253/trafficserver,bryancall/trafficserver,rpufky/trafficserver,taoyunxing/trafficserver,PSUdaemon/trafficserver,chenglongwei/trafficserver,bryancall/trafficserver,clearswift/trafficserver,taoyunxing/trafficserver,reveller/trafficserver,persiaAziz/trafficserver,SolidWallOfCode/trafficserver,PSUdaemon/trafficserver,clearswift/trafficserver,dyrock/trafficserver,persiaAziz/trafficserver,SolidWallOfCode/trafficserver,reveller/trafficserver,persiaAziz/trafficserver,taoyunxing/trafficserver,PSUdaemon/trafficserver,chitianhao/trafficserver,PSUdaemon/trafficserver,dyrock/trafficserver,chitianhao/trafficserver,rahmalik/trafficserver,chitianhao/trafficserver,rpufky/trafficserver,pbchou/trafficserver,bryancall/trafficserver,taoyunxing/trafficserver,SolidWallOfCode/trafficserver,rahmalik/trafficserver,vmamidi/trafficserver,dyrock/trafficserver,chenglongwei/trafficserver,davidbz/trafficserver,chitianhao/trafficserver,davidbz/trafficserver,PSUdaemon/trafficserver,clearswift/trafficserver,duke8253/trafficserver,dyrock/trafficserver,vmamidi/trafficserver,reveller/trafficserver,taoyunxing/trafficserver,chenglongwei/trafficserver,vmamidi/trafficserver,persiaAziz/trafficserver,pbchou/trafficserver,chenglongwei/trafficserver,chenglongwei/trafficserver,chitianhao/trafficserver,dyrock/trafficserver,dyrock/trafficserver,clearswift/trafficserver,chenglongwei/trafficserver,bryancall/trafficserver,dyrock/trafficserver,chitianhao/trafficserver,davidbz/trafficserver,rahmalik/trafficserver,davidbz/trafficserver,clearswift/trafficserver,taoyunxing/trafficserver,vmamidi/trafficserver,rpufky/trafficserver,pbchou/trafficserver,davidbz/trafficserver,reveller/trafficserver,duke8253/trafficserver,clearswift/trafficserver,vmamidi/trafficserver,PSUdaemon/trafficserver,davidbz/trafficserver,persiaAziz/trafficserver,rahmalik/trafficserver,duke8253/trafficserver,pbchou/trafficserver,pbchou/trafficserver,PSUdaemon/trafficserver,taoyunxing/trafficserver,chenglongwei/trafficserver,rpufky/trafficserver,vmamidi/trafficserver,persiaAziz/trafficserver,clearswift/trafficserver,duke8253/trafficserver,reveller/trafficserver,persiaAziz/trafficserver,reveller/trafficserver,pbchou/trafficserver,rpufky/trafficserver,rahmalik/trafficserver,duke8253/trafficserver,rahmalik/trafficserver,taoyunxing/trafficserver,PSUdaemon/trafficserver,rpufky/trafficserver,rahmalik/trafficserver,reveller/trafficserver,rpufky/trafficserver,SolidWallOfCode/trafficserver,clearswift/trafficserver,reveller/trafficserver,rpufky/trafficserver,PSUdaemon/trafficserver,chenglongwei/trafficserver,chitianhao/trafficserver,rahmalik/trafficserver,rpufky/trafficserver,duke8253/trafficserver,SolidWallOfCode/trafficserver,bryancall/trafficserver