Although all this code might be moved around later, it's a good idea
to unhackify it now. :-)

Review URL: https://codereview.chromium.org/1067193004

Cr-Commit-Position: refs/heads/master@{#27672}