This reverts commit d92e7eb2. Reason for revert: Causes 71736995 Change-Id: I8294bdb65a496bfd0170ec606d20d604d5ef6271