This reverts commit 31770cf52a2583fbf012b99e08fe7f068bdef166. Change-Id: Ibbd1ffdea6de5d64dec0ad4eac94185aa5c7de77