This reverts commit 5e75975e. Reason for revert: breakages fixed Change-Id: Id54499eabaca649bee5ea6452a3a4134d8773e2d