This reverts commit 9af63f473e1d0d6c47a741a046c41642dfc1c178. Cr-Commit-Position: refs/heads/master@{#9994}