This reverts commit ef2cfec1a2. Reason for revert: https://issuetracker.google.com/408118041
ef2cfec1a2