This reverts commit 74f671ef. Reason for revert: <INSERT REASONING HERE> Change-Id: I62ed25a2f6333be457cf3c5b00a9510ed6252fbb