f2f80c09b6
This reverts commit 3af0fe0c9df2fc1e0a4d6bcd827a4d7aa28dbdeb while investigating issues 13751080 and 13883978. Bug: 13751080.