This reverts commit 445584d3. Reason for revert: <INSERT REASONING HERE> Change-Id: I911049f64c4e963cfa47fd8bc7f16ed14e25b057