This partially reverts commit 43a67fe05f Change-Id: I60746fa92fc89664f7ecea09f0d9cf3bf4899812
43a67fe05f