This reverts commit e37099ffdfc966d52b4323a3705359ea42fa283e. Fixes bug 18652251 Change-Id: Ib00e8269558aae294ff6453d1f6ceef1771c4572
This reverts commit e37099ffdfc966d52b4323a3705359ea42fa283e. Fixes bug 18652251 Change-Id: Ib00e8269558aae294ff6453d1f6ceef1771c4572