This reverts commit 8de45fc749273c56bab02dd2f52edd1e936afec4. Change-Id: Idd39c35bc506a1f3d478885dcac240d65398945a