Revert "Patch in http://crrev.com/22903029"

This reverts commit cbed202c2db561056f0a509ecdc209bfb003c29b.

BUG: 10263198

Change-Id: Ie80bb7b98a16ba1fffb2fa38cb4537775fe04f9f
2 files changed