This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa. Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3