This reverts commit 1a9bd5b813. I suspect that this patch may have caused https://crbug.com/1171438.
1a9bd5b813