This partially reverts commit 43a67fe05fcb6f3a70293996c80671884e969b21 Change-Id: I60746fa92fc89664f7ecea09f0d9cf3bf4899812