This reverts commit 1f106f4.
Reverted #186346 on behalf of https://github.com/wdvr due to Diff reverted internally (comment)