This reverts commit 537c2cfc2c. Fixes: 77278897 Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
537c2cfc2c