This reverts commit 753fc58932e976086069bacb3e5252332960644b. Change-Id: Ie17b4918fa404eb768c0f3ce5109d6cc8b2d1da8