This reverts commit 51b8255c. Breaks app compat. Bug: 124792601 Change-Id: I99690d0092066fdfd76dc68aa3ed0fe0df873892