Revert 802d563fde4958ebd247b723e09ca32f5ca7f159

Change-Id: I689ed6cf70fc6e01c3276c2515cb9efc916e330d