This reverts commit 5520581b5f. bug 28189634 Change-Id: I2d2b859f6d9bd44434fa901cce990583f514980c
5520581b5f