This reverts commit 4d6f55f9. Reason for revert: No longer needed Bug: 217545629 Change-Id: I51978bf3a27a48bec890e044b9989ea46991a9be