Fails for some apps. bug:21674542 This reverts commit 7ce4b3d4. Change-Id: Ie25852c022391834858b2f5e34e8c7aeb1c3b3dd