This reverts commit de2514c0e2631e33996d131e8743fbcb7bbd57c4 as it breaks analyze-linux and web_tests-0-linux checks.