Fails for some apps. bug: 21674542 This reverts commit 1d5006c3. Change-Id: Ia74b5e54d59f8ffe9992591324a12f71efb67af4