This reverts commit c3e5cb2d0acb0d7098661f0c79122034cde83593. Change-Id: I901128554f825e5b8c071b6fb67d8ed4c359ffcb