This reverts commit 211af95.
Reverted #186226 on behalf of https://github.com/atalman due to reverted internally (comment)