This reverts commit 0393dd51c9edcc2139c372755f490d11c50a2af3. Change-Id: If0bf358a1cf7908e5c46dc598b7a42aa667fe644