Cherry-pick http://codereview.chromium.org/1742012

This reverts commit d69d2e30f295acb0d25771f412ca271869d0ba43, which is now included in the above change.

Fix bug: 2629965

Change-Id: I5b07ba8f9a39c4337bc03b0c9aa91eafcd6863be
1 file changed