This reverts commit 1edc173e5920ed1192325588a4e9385408e660fa. Change-Id: Icc09ef507b83f7f7eeb20dc2265d84b58d7ba44e