This reverts commit c6f5738d3c8621d2e682026e35e57f540750d117. Change-Id: Ibb330f44c3910b3fc124ee8c718a508cdf3b32b4