This reverts commit 7fbc1040, which
reverted commit dc626af3.

R=rnystrom@google.com

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