This reverts commit ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814. Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc