This reverts commit e9883b8a92d72a3cfd947b3ce835bc8e4da2f1b2. Change-Id: I61664e2a2589d09e5a93a776cf3c391049e7b284