This reverts commit 99a7f805. This reverts commit 2697cd19. This reverts commit 8c51b6f1. This reverts commit d4aedc81. Reason for revert: Breaks iOS release branch builds. BUG=623762 TBR=agable,maruel Review URL: https://codereview.chromium.org/2162583004 .