revert commits 0633b3155ec2d5d25dad9f374aa602bf77a8cc01 and 7bd263167eb47ca5ff272cdbe8d4b53a86d681a6

Change-Id: I3718cbb2bb419f4351bd8f95314beb89744bde28