This reverts commit 0590ac70a93c713c6cf28c3bcbce287d9864f037. Change-Id: I1f4b34c0f8246bb601e2ba5f14eabe9c36d33d94