This reverts commit 34e3efd8 and bd9c257d CCBUG: 465733 CCBUG: 443215 (cherry picked from commit cdf2e1a9)