This reverts commit c9464617. Reason for revert: 155930637 Change-Id: Id452d316d1c1721fce715474df009ebe0fb719e8