This reverts commit 81950cd2605224823011d4764438935139804b89. Change-Id: Ibe3f1e46d99b87cfe1cbd896a2e62cd626e73b21