Revert "Fix build breakage" (#6568)
Revert "Fix build breakage" (#6568)


alanorozco/amphtml,DarXector/amphtml,gumgum/amphtml,ecoron/amphtml,rsimha-amp/amphtml,sklobovskaya/amphtml,gumgum/amphtml,keithwrightbos/amphtml,burtcorp/amphtml,sriramkrish85/amphtml,src-code/amphtml,jpettitt/amphtml,yieldbot/amphtml,rajkumarsrk/amphtml,vmarteev/amphtml,gumgum/amphtml,jmadler/amphtml,avimehta/amphtml,src-code/amphtml,pedjoni8/amphtml,keithwrightbos/amphtml,DAC-f1h-dev/amphtml,techhtml/amphtml,nexxtv/amphtml,vmarteev/amphtml,donttrustthisbot/amphtml,yandex-pcode/amphtml,powdercloud/amphtml,burtcorp/amphtml,bpaduch/amphtml,pietergreyling/amphtml,kixer-com/amphtml,mhc-gh/amphtml,dotandads/amphtml,smartadserver/amphtml,zhouyx/amphtml,vmarteev/amphtml,clawr/amphtml,danielrozenberg/amphtml,cvializ/amphtml,voyagegroup/amphtml,adup-tech/amphtml,koshka/amphtml,JuliusThms/amphtml,nexxtv/amphtml,kmh287/amphtml,gumgum/amphtml,koshka/amphtml,sklobovskaya/amphtml,Mobusi-ads/amphtml,BenDz/amphtml,kixer-com/amphtml,ADITION/amphtml,kamtschatka/amphtml,fullspeed-sp/amphtml,sklobovskaya/amphtml,yandex-pcode/amphtml,Gregable/amphtml,gumgum/amphtml,laterpay/amphtml,zhouyx/amphtml,zhucl/amphtml,koshka/amphtml,ampproject/amphtml,media-net/amphtml,DAC-f1h-dev/amphtml,zhucl/amphtml,chaveznvg/amphtml,adup-tech/amphtml,comScore/amphtml,lzanol/amphtml,jpettitt/amphtml,cory-work/amphtml,fullspeed-sp/amphtml,alanorozco/amphtml,sharethrough/amphtml,DarXector/amphtml,BenDz/amphtml,Mobusi-ads/amphtml,zhouyx/amphtml,donttrustthisbot/amphtml,koshka/amphtml,zhangsu/amphtml,sebastianbenz/amphtml,nexxtv/amphtml,luciancrasovan/amphtml,Adtoma/amphtml,Gregable/amphtml,laterpay/amphtml,wjfang/amphtml,aghassemi/amphtml,sharethrough/amphtml,yieldbot/amphtml,keithwrightbos/amphtml,donttrustthisbot/amphtml,kamtschatka/amphtml,media-net/amphtml,bpaduch/amphtml,lannka/amphtml,zhouyx/amphtml,zhouyx/amphtml,honeybadgerdontcare/amphtml,DistroScale/amphtml,alanorozco/amphtml,bpaduch/amphtml,sharethrough/amphtml,Gregable/amphtml,ampproject/amphtml,DarXector/amphtml,engtat/amphtml,prateekbh/amphtml,jmadler/amphtml,adup-tech/amphtml,jdelhommeau/amphtml,wjfang/amphtml,keithwrightbos/amphtml,media-net/amphtml,jdelhommeau/amphtml,mhc-gh/amphtml,arealit/amphtml,widespace-os/amphtml,rsimha-amp/amphtml,engtat/amphtml,rsimha-amp/amphtml,zhangsu/amphtml,sriramkrish85/amphtml,pedjoni8/amphtml,jpettitt/amphtml,comScore/amphtml,ampproject/amphtml,Gregable/amphtml,engtat/amphtml,camelburrito/amphtml,bpaduch/amphtml,widespace-os/amphtml,jpettitt/amphtml,laterpay/amphtml,keithwrightbos/amphtml,BenDz/amphtml,clawr/amphtml,laterpay/amphtml,Mobusi-ads/amphtml,wjfang/amphtml,fullspeed-sp/amphtml,kamtschatka/amphtml,BenDz/amphtml,keithwrightbos/amphtml,pedjoni8/amphtml,voyagegroup/amphtml,lzanol/amphtml,honeybadgerdontcare/amphtml,camelburrito/amphtml,kixer-com/amphtml,yieldbot/amphtml,mhc-gh/amphtml,zhangsu/amphtml,jpettitt/amphtml,dotandads/amphtml,alanorozco/amphtml,laterpay/amphtml,zhucl/amphtml,fullspeed-sp/amphtml,JuliusThms/amphtml,jridgewell/amphtml,avimehta/amphtml,jridgewell/amphtml,cvializ/amphtml,DAC-f1h-dev/amphtml,smartadserver/amphtml,jpettitt/amphtml,sklobovskaya/amphtml,ADITION/amphtml,jpettitt/amphtml,kamtschatka/amphtml,yieldbot/amphtml,adiant/amphtml,sebastianbenz/amphtml,BenDz/amphtml,danielrozenberg/amphtml,JuliusThms/amphtml,sklobovskaya/amphtml,pietergreyling/amphtml,jdelhommeau/amphtml,lzanol/amphtml,camelburrito/amphtml,chaveznvg/amphtml,src-code/amphtml,adiant/amphtml,kmh287/amphtml,taboola/amphtml,Gregable/amphtml,nexxtv/amphtml,jdelhommeau/amphtml,tlong2/amphtml,DistroScale/amphtml,luciancrasovan/amphtml,sharethrough/amphtml,danielrozenberg/amphtml,Gregable/amphtml,erwinmombay/amphtml,DAC-f1h-dev/amphtml,src-code/amphtml,fullspeed-sp/amphtml,Adtoma/amphtml,Mobusi-ads/amphtml,dotandads/amphtml,voyagegroup/amphtml,voyagegroup/amphtml,shawnbuso/amphtml,adiant/amphtml,powdercloud/amphtml,kixer-com/amphtml,kmh287/amphtml,adiant/amphtml,rlugojr/amphtml,sriramkrish85/amphtml,mhc-gh/amphtml,kmh287/amphtml,Adtoma/amphtml,burtcorp/amphtml,sebastianbenz/amphtml,powdercloud/amphtml,sklobovskaya/amphtml,adup-tech/amphtml,aghassemi/amphtml,yieldbot/amphtml,rajkumarsrk/amphtml,pietergreyling/amphtml,jdelhommeau/amphtml,honeybadgerdontcare/amphtml,danielrozenberg/amphtml,powdercloud/amphtml,DistroScale/amphtml,yieldmo/amphtml,cory-work/amphtml,kixer-com/amphtml,kixer-com/amphtml,honeybadgerdontcare/amphtml,pedjoni8/amphtml,techhtml/amphtml,cory-work/amphtml,erwinmombay/amphtml,vmarteev/amphtml,erwinmombay/amphtml,pedjoni8/amphtml,sortable/amphtml,rajkumarsrk/amphtml,zhangsu/amphtml,sortable/amphtml,clawr/amphtml,jmadler/amphtml,widespace-os/amphtml,zhouyx/amphtml,ampproject/amphtml,dotandads/amphtml,shawnbuso/amphtml,lannka/amphtml,prateekbh/amphtml,shawnbuso/amphtml,pietergreyling/amphtml,adup-tech/amphtml,arealit/amphtml,zhucl/amphtml,tlong2/amphtml,dotandads/amphtml,voyagegroup/amphtml,jridgewell/amphtml,mhc-gh/amphtml,avimehta/amphtml,lannka/amphtml,rsimha-amp/amphtml,spotxchange/amphtml,jridgewell/amphtml,jmadler/amphtml,kamtschatka/amphtml,sharethrough/amphtml,spotxchange/amphtml,DAC-f1h-dev/amphtml,smartadserver/amphtml,taboola/amphtml,DarXector/amphtml,wjfang/amphtml,sharethrough/amphtml,prateekbh/amphtml,aghassemi/amphtml,spotxchange/amphtml,media-net/amphtml,DistroScale/amphtml,ecoron/amphtml,lannka/amphtml,adiant/amphtml,zhangsu/amphtml,nexxtv/amphtml,ADITION/amphtml,ecoron/amphtml,adiant/amphtml,powdercloud/amphtml,rajkumarsrk/amphtml,yandex-pcode/amphtml,sriramkrish85/amphtml,cory-work/amphtml,techhtml/amphtml,danielrozenberg/amphtml,donttrustthisbot/amphtml,techhtml/amphtml,spotxchange/amphtml,zhouyx/amphtml,yieldbot/amphtml,clawr/amphtml,bpaduch/amphtml,honeybadgerdontcare/amphtml,wjfang/amphtml,src-code/amphtml,cvializ/amphtml,yandex-pcode/amphtml,clawr/amphtml,yandex-pcode/amphtml,lzanol/amphtml,donttrustthisbot/amphtml,kamtschatka/amphtml,ecoron/amphtml,avimehta/amphtml,burtcorp/amphtml,jmadler/amphtml,smartadserver/amphtml,avimehta/amphtml,yieldmo/amphtml,widespace-os/amphtml,taboola/amphtml,vmarteev/amphtml,shawnbuso/amphtml,sebastianbenz/amphtml,yieldmo/amphtml,luciancrasovan/amphtml,rsimha-amp/amphtml,shawnbuso/amphtml,DistroScale/amphtml,wjfang/amphtml,DarXector/amphtml,nexxtv/amphtml,DAC-f1h-dev/amphtml,arealit/amphtml,alanorozco/amphtml,ADITION/amphtml,honeybadgerdontcare/amphtml,JuliusThms/amphtml,nexxtv/amphtml,erwinmombay/amphtml,taboola/amphtml,camelburrito/amphtml,sortable/amphtml,erwinmombay/amphtml,wjfang/amphtml,rlugojr/amphtml,burtcorp/amphtml,engtat/amphtml,cvializ/amphtml,voyagegroup/amphtml,Adtoma/amphtml,sriramkrish85/amphtml,arealit/amphtml,zhangsu/amphtml,rlugojr/amphtml,jpettitt/amphtml,sebastianbenz/amphtml,tlong2/amphtml,lannka/amphtml,voyagegroup/amphtml,taboola/amphtml,powdercloud/amphtml,prateekbh/amphtml,taboola/amphtml,smartadserver/amphtml,spotxchange/amphtml,rajkumarsrk/amphtml,ampproject/amphtml,gumgum/amphtml,sortable/amphtml,comScore/amphtml,camelburrito/amphtml,DarXector/amphtml,chaveznvg/amphtml,jdelhommeau/amphtml,yieldmo/amphtml,media-net/amphtml,zhucl/amphtml,lannka/amphtml,engtat/amphtml,jridgewell/amphtml,ecoron/amphtml,arealit/amphtml,zhucl/amphtml,src-code/amphtml,fullspeed-sp/amphtml,kixer-com/amphtml,JuliusThms/amphtml,tlong2/amphtml,chaveznvg/amphtml,rajkumarsrk/amphtml,techhtml/amphtml,adup-tech/amphtml,yandex-pcode/amphtml,camelburrito/amphtml,comScore/amphtml,rajkumarsrk/amphtml,lzanol/amphtml,donttrustthisbot/amphtml,pedjoni8/amphtml,aghassemi/amphtml,Gregable/amphtml,koshka/amphtml,shawnbuso/amphtml,sriramkrish85/amphtml,widespace-os/amphtml,vmarteev/amphtml,DistroScale/amphtml,pietergreyling/amphtml,Adtoma/amphtml,donttrustthisbot/amphtml,arealit/amphtml,dotandads/amphtml,Mobusi-ads/amphtml,shawnbuso/amphtml,rlugojr/amphtml,rsimha-amp/amphtml,sortable/amphtml,pietergreyling/amphtml,adiant/amphtml,ampproject/amphtml,keithwrightbos/amphtml,koshka/amphtml,sebastianbenz/amphtml,powdercloud/amphtml,jmadler/amphtml,tlong2/amphtml,jridgewell/amphtml,Mobusi-ads/amphtml,sklobovskaya/amphtml,rlugojr/amphtml,spotxchange/amphtml,chaveznvg/amphtml,yandex-pcode/amphtml,ampproject/amphtml,luciancrasovan/amphtml,tlong2/amphtml,comScore/amphtml,danielrozenberg/amphtml,mhc-gh/amphtml,yieldmo/amphtml,prateekbh/amphtml,rsimha-amp/amphtml,yieldmo/amphtml,laterpay/amphtml,bpaduch/amphtml,smartadserver/amphtml,prateekbh/amphtml,luciancrasovan/amphtml,media-net/amphtml,clawr/amphtml,rlugojr/amphtml,media-net/amphtml,avimehta/amphtml,alanorozco/amphtml,engtat/amphtml,taboola/amphtml,comScore/amphtml,prateekbh/amphtml,kmh287/amphtml,kmh287/amphtml,BenDz/amphtml,camelburrito/amphtml,techhtml/amphtml,cvializ/amphtml,media-net/amphtml,ampproject/amphtml,lzanol/amphtml,danielrozenberg/amphtml,comScore/amphtml,clawr/amphtml,Adtoma/amphtml,mhc-gh/amphtml,mhc-gh/amphtml,bpaduch/amphtml,sortable/amphtml,aghassemi/amphtml,cvializ/amphtml,honeybadgerdontcare/amphtml,luciancrasovan/amphtml,engtat/amphtml,burtcorp/amphtml,JuliusThms/amphtml,alanorozco/amphtml,widespace-os/amphtml,zhucl/amphtml,Gregable/amphtml,lannka/amphtml,danielrozenberg/amphtml,cory-work/amphtml,aghassemi/amphtml,cory-work/amphtml,erwinmombay/amphtml,luciancrasovan/amphtml,yieldmo/amphtml,arealit/amphtml,jridgewell/amphtml,cory-work/amphtml,alanorozco/amphtml,vmarteev/amphtml,gumgum/amphtml,chaveznvg/amphtml,ecoron/amphtml,ADITION/amphtml