This reverts commit 4ca5e6c5. Reason for revert: <INSERT REASONING HERE> Change-Id: I75ed57659ec5b847ce630cd4e7e03ab07bd2a3bc