This reverts commit 2d6f1e59435e38046e5cdf7e346fde18ed9b1461. Change-Id: Ifc41ea29174d5752bd2f96a3248b6ff96ffb9e9f