It's been reverted: https://codereview.chromium.org/1472743002/