This reverts commit 294a0509. Need to investigate a compilation error. Change-Id: I62020f6e546c9faf5f4a2ed6cc1f7e1499c2fa30