This reverts commit 1d8d0159e72556ea20aba325fb27d8470282e1ba. Change-Id: Iffd8cbad98ff7e498032df1d226f4fbc7cde95b1