Reverting to stop tests breakage. This reverts commit 3138584a. Change-Id: Idd30d458cef67839416ffeae4d558da2affd29d0